[ros-diffs] [sginsberg] 42327: - Properly define dummy unions/structs for MSVC too.

Author: sginsberg
Date: Sat Aug  1 21:10:16 2009
New Revision: 42327

URL: http://svn.reactos.org/svn/reactos?rev=42327&view=rev
Log:
- Properly define dummy unions/structs for MSVC too.

Modified:
    trunk/reactos/include/ddk/ntdef.h
    trunk/reactos/include/psdk/windef.h
    trunk/reactos/tools/winebuild/winglue.h

Modified: trunk/reactos/include/ddk/ntdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42…
==============================================================================
--- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Aug  1 21:10:16 2009
@@ -85,8 +85,8 @@
 // We should use the -fms-extensions compiler flag for gcc,
 // and clean up the mess.
 //
+#ifndef NONAMELESSUNION
 #ifdef __GNUC__
-#ifndef NONAMELESSUNION
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
@@ -95,11 +95,11 @@
 #define _ANONYMOUS_UNION __extension__
 #endif /* __cplusplus */
 #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
-#endif /* NONAMELESSUNION */
 #elif defined(__WATCOMC__) || defined(_MSC_VER)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__/__WATCOMC__ */
+#endif /* NONAMELESSUNION */
 
 #ifndef _ANONYMOUS_UNION
 #define _ANONYMOUS_UNION

Modified: trunk/reactos/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=…
==============================================================================
--- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Aug  1 21:10:16 2009
@@ -202,8 +202,8 @@
 #define DBG_UNREFERENCED_PARAMETER(P)
 #define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
 
+#ifndef NONAMELESSUNION
 #ifdef __GNUC__
-#ifndef NONAMELESSUNION
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
@@ -212,11 +212,11 @@
 #define _ANONYMOUS_UNION __extension__
 #endif /* __cplusplus */
 #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
-#endif /* NONAMELESSUNION */
 #elif defined(__WATCOMC__) || defined(_MSC_VER)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__/__WATCOMC__ */
+#endif /* NONAMELESSUNION */
 
 #ifndef _ANONYMOUS_UNION
 #define _ANONYMOUS_UNION

Modified: trunk/reactos/tools/winebuild/winglue.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…
==============================================================================
--- trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] (original)
+++ trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] Sat Aug  1 21:10:16 2009
@@ -33,8 +33,8 @@
 #define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC
 #endif
 
+#ifndef NONAMELESSUNION
 #ifdef __GNUC__
-#ifndef NONAMELESSUNION
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #define _ANONYMOUS_UNION __extension__
 #define _ANONYMOUS_STRUCT __extension__
@@ -43,11 +43,12 @@
 #define _ANONYMOUS_UNION __extension__
 #endif /* __cplusplus */
 #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
-#endif /* NONAMELESSUNION */
 #elif defined(__WATCOMC__) || defined(_MSC_VER)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif /* __GNUC__/__WATCOMC__ */
+#endif /* NONAMELESSUNION */
+
 #ifndef _ANONYMOUS_UNION
 #define _ANONYMOUS_UNION
 #define _UNION_NAME(x) x