[tkreuzer] 44631: Fix C_ASSERT yet another time.

Author: tkreuzer
Date: Thu Dec 17 00:37:18 2009
New Revision: 44631

URL: http://svn.reactos.org/svn/reactos?rev=44631&view=rev
Log:
Fix C_ASSERT yet another time.

Modified:
    branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h
    branches/ros-amd64-bringup/reactos/include/crt/malloc.h
    branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h
    branches/ros-amd64-bringup/reactos/include/psdk/winnt.h

Modified: branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h [iso-8859-1] Thu Dec 17 00:37:18 2009
@@ -90,7 +90,7 @@
   } _CrtMemState;

#ifndef _STATIC_ASSERT
-#define _STATIC_ASSERT(expr) char __static_assert_p(char static_assert[(expr)?1:-1])
+#define _STATIC_ASSERT(expr) extern char (*static_assert(void)) [(expr) ? 1 : -1]
 #endif

#ifndef _ASSERT

Modified: branches/ros-amd64-bringup/reactos/include/crt/malloc.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/malloc.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/malloc.h [iso-8859-1] Thu Dec 17 00:37:18 2009
@@ -25,7 +25,7 @@
 #endif

#ifndef _STATIC_ASSERT
-#define _STATIC_ASSERT(expr) char __static_assert_p(char static_assert[(expr)?1:-1])
+#define _STATIC_ASSERT(expr) extern char (*static_assert(void)) [(expr) ? 1 : -1]
 #endif

/* Return codes for _heapwalk()  */

Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/ntdef.h [iso-8859-1] Thu Dec 17 00:37:18 2009
@@ -693,8 +693,7 @@
 //
 // C_ASSERT Definition
 //
-#define C_ASSERT(exp) \
-    char __c_assert_p(char c_assert[(exp)?1:-1])
+#define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1]

Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Thu Dec 17 00:37:18 2009
@@ -229,8 +229,7 @@
 typedef WORD FSHORT;
 typedef DWORD FLONG;

-#define C_ASSERT(exp) \
-    char __c_assert_p(char c_assert[(exp)?1:-1])
+#define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1]

#include "intrin.h"