Author: ktietz
Date: Sat Feb 27 15:43:32 2010
New Revision: 45698
URL: http://svn.reactos.org/svn/reactos?rev=45698&view=rev
Log:
Guard ANONYMOUS defines by __ANONYMOUS_DEFINED guard to prevent double
definitions. Additional synchronize amount of DUMMYSTRUCTNAME defines.
Modified:
branches/header-work/include/ddk/ntdef.h
branches/header-work/include/psdk/windef.h
Modified: branches/header-work/include/ddk/ntdef.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntdef.h?rev=45698&r1=45697&r2=45698&view=diff
==============================================================================
--- branches/header-work/include/ddk/ntdef.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntdef.h [iso-8859-1] Sat Feb 27 15:43:32
2010
@@ -93,6 +93,9 @@
// We should use the -fms-extensions compiler flag for gcc,
// and clean up the mess.
//
+#ifndef __ANONYMOUS_DEFINED
+#define __ANONYMOUS_DEFINED
+
#ifndef NONAMELESSUNION
#ifdef __GNUC__
#define _ANONYMOUS_UNION __GNU_EXTENSION
@@ -132,14 +135,18 @@
#define DUMMYSTRUCTNAME s
#define DUMMYSTRUCTNAME2 s2
#define DUMMYSTRUCTNAME3 s3
+#define DUMMYSTRUCTNAME4 s4
+#define DUMMYSTRUCTNAME5 s5
#else
#define _STRUCT_NAME(x)
#define DUMMYSTRUCTNAME
#define DUMMYSTRUCTNAME2
#define DUMMYSTRUCTNAME3
-#endif
-
-
+#define DUMMYSTRUCTNAME4
+#define DUMMYSTRUCTNAME5
+#endif
+
+#endif /* __ANONYMOUS_DEFINED */
// FIXME
#undef UNALIGNED
Modified: branches/header-work/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/windef.h?rev=45698&r1=45697&r2=45698&view=diff
==============================================================================
--- branches/header-work/include/psdk/windef.h [iso-8859-1] (original)
+++ branches/header-work/include/psdk/windef.h [iso-8859-1] Sat Feb 27 15:43:32
2010
@@ -204,16 +204,13 @@
#define DBG_UNREFERENCED_PARAMETER(P)
#define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
+#ifndef __ANONYMOUS_DEFINED
+#define __ANONYMOUS_DEFINED
+
#ifndef NONAMELESSUNION
#ifdef __GNUC__
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define _ANONYMOUS_UNION __extension__
#define _ANONYMOUS_STRUCT __extension__
-#else
-#if defined(__cplusplus)
-#define _ANONYMOUS_UNION __extension__
-#endif /* __cplusplus */
-#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
#elif defined(__WATCOMC__) || defined(_MSC_VER)
#define _ANONYMOUS_UNION
#define _ANONYMOUS_STRUCT
@@ -262,6 +259,8 @@
#define DUMMYSTRUCTNAME4
#define DUMMYSTRUCTNAME5
#endif
+
+#endif /* __ANONYMOUS_DEFINED */
#ifndef NO_STRICT
#ifndef STRICT
