From 478b2c3e4ed519671bbd03a87ae80a52bafc8b4d Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Sat, 1 Aug 2009 19:10:16 +0000 Subject: [PATCH] - Properly define dummy unions/structs for MSVC too. svn path=/trunk/; revision=42327 --- reactos/include/ddk/ntdef.h | 4 ++-- reactos/include/psdk/windef.h | 4 ++-- reactos/tools/winebuild/winglue.h | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/include/ddk/ntdef.h b/reactos/include/ddk/ntdef.h index 24082bd10cf..10b3156fa77 100644 --- a/reactos/include/ddk/ntdef.h +++ b/reactos/include/ddk/ntdef.h @@ -85,8 +85,8 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!! // We should use the -fms-extensions compiler flag for gcc, // and clean up the mess. // -#ifdef __GNUC__ #ifndef NONAMELESSUNION +#ifdef __GNUC__ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -95,11 +95,11 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!! #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 diff --git a/reactos/include/psdk/windef.h b/reactos/include/psdk/windef.h index cbd325b0aa3..42f9efd97a9 100644 --- a/reactos/include/psdk/windef.h +++ b/reactos/include/psdk/windef.h @@ -202,8 +202,8 @@ extern "C" { #define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) -#ifdef __GNUC__ #ifndef NONAMELESSUNION +#ifdef __GNUC__ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -212,11 +212,11 @@ extern "C" { #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 diff --git a/reactos/tools/winebuild/winglue.h b/reactos/tools/winebuild/winglue.h index 2765dfdff44..5d73e436a4f 100644 --- a/reactos/tools/winebuild/winglue.h +++ b/reactos/tools/winebuild/winglue.h @@ -33,8 +33,8 @@ #define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC #endif -#ifdef __GNUC__ #ifndef NONAMELESSUNION +#ifdef __GNUC__ #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