Create a better definition of C_ASSERT to avoid multiple definition errors caused...

svn path=/branches/ros-amd64-bringup/; revision=44218

diff --git a/reactos/include/ddk/ntdef.h b/reactos/include/ddk/ntdef.h
index 045c86b..547495b 100644 (file)
--- a/reactos/include/ddk/ntdef.h
+++ b/reactos/include/ddk/ntdef.h
@@ -679,10 +679,8 @@ typedef struct _SINGLE_LIST_ENTRY {
 //
 // C_ASSERT Definition
 //
-#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y)
-#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y)
-#define __C_ASSERT_DO_JOIN2(X, Y) X##Y
-#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1]
+#define C_ASSERT(exp) \
+    extern char __c_assert__[exp ? 1 : -1];