Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Guard ANONYMOUS defines by __ANONYMOUS_DEFINED guard to prevent double definitions. Additional synchronize amount of DUMMYSTRUCTNAME defines.

Browse source 
svn path=/branches/header-work/; revision=45698
This commit is contained in:
Kai Tietz 2010-02-27 14:43:32 +00:00
parent 2a50af3a8e
commit a61593425b
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/ddk/ntdef.h
View file

@ -93,6 +93,9 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
// We should use the -fms-extensions compiler flag for gcc, // We should use the -fms-extensions compiler flag for gcc,
// and clean up the mess. // and clean up the mess.
// //
#ifndef __ANONYMOUS_DEFINED
#define __ANONYMOUS_DEFINED
#ifndef NONAMELESSUNION #ifndef NONAMELESSUNION
#ifdef __GNUC__ #ifdef __GNUC__
#define _ANONYMOUS_UNION __GNU_EXTENSION #define _ANONYMOUS_UNION __GNU_EXTENSION
@ -132,14 +135,18 @@ typedef unsigned long POINTER_64; // FIXME! HACK!!!
#define DUMMYSTRUCTNAME s #define DUMMYSTRUCTNAME s
#define DUMMYSTRUCTNAME2 s2 #define DUMMYSTRUCTNAME2 s2
#define DUMMYSTRUCTNAME3 s3 #define DUMMYSTRUCTNAME3 s3
#define DUMMYSTRUCTNAME4 s4
#define DUMMYSTRUCTNAME5 s5
#else #else
#define _STRUCT_NAME(x) #define _STRUCT_NAME(x)
#define DUMMYSTRUCTNAME #define DUMMYSTRUCTNAME
#define DUMMYSTRUCTNAME2 #define DUMMYSTRUCTNAME2
#define DUMMYSTRUCTNAME3 #define DUMMYSTRUCTNAME3
#define DUMMYSTRUCTNAME4
#define DUMMYSTRUCTNAME5
#endif #endif
#endif /* __ANONYMOUS_DEFINED */
// FIXME // FIXME
#undef UNALIGNED #undef UNALIGNED

11
include/psdk/windef.h
View file

@ -204,16 +204,13 @@ extern "C" {
#define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_PARAMETER(P)
#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
#ifndef __ANONYMOUS_DEFINED
#define __ANONYMOUS_DEFINED
#ifndef NONAMELESSUNION #ifndef NONAMELESSUNION
#ifdef __GNUC__ #ifdef __GNUC__
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_UNION __extension__
#define _ANONYMOUS_STRUCT __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) #elif defined(__WATCOMC__) || defined(_MSC_VER)
#define _ANONYMOUS_UNION #define _ANONYMOUS_UNION
#define _ANONYMOUS_STRUCT #define _ANONYMOUS_STRUCT
@ -263,6 +260,8 @@ extern "C" {
#define DUMMYSTRUCTNAME5 #define DUMMYSTRUCTNAME5
#endif #endif
#endif /* __ANONYMOUS_DEFINED */
#ifndef NO_STRICT #ifndef NO_STRICT
#ifndef STRICT #ifndef STRICT
#define STRICT 1 #define STRICT 1