Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed GUID_DEFINED to _GUID_DEFINED for compatibility (prevent conflict) with mingw headers.

Browse source 
svn path=/trunk/; revision=3628
This commit is contained in:
Robert Dickenson 2002-10-07 12:34:33 +00:00
parent 4fbeb6d1f1
commit 6cf061fde8
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/include/ddk/pnptypes.h
View file

@ -5,8 +5,8 @@ struct _DEVICE_OBJECT;
struct _FILE_OBJECT; struct _FILE_OBJECT;
// windows.h may be included before // windows.h may be included before
#ifndef GUID_DEFINED #ifndef _GUID_DEFINED
#define GUID_DEFINED #define _GUID_DEFINED
typedef struct _GUID { typedef struct _GUID {
ULONG Data1; ULONG Data1;

6
reactos/include/net/ndis.h
View file

@ -197,8 +197,8 @@ typedef CONST CHAR *PCSTR;
#if defined(NDIS_MINIPORT_DRIVER) || !defined(_MSC_VER) #if defined(NDIS_MINIPORT_DRIVER) || !defined(_MSC_VER)
#ifndef GUID_DEFINED #ifndef _GUID_DEFINED
#define GUID_DEFINED #define _GUID_DEFINED
typedef struct _GUID { typedef struct _GUID {
ULONG Data1; ULONG Data1;
@ -207,7 +207,7 @@ typedef struct _GUID {
UCHAR Data4[8]; UCHAR Data4[8];
} GUID; } GUID;
#endif /* GUID_DEFINED */ #endif /* _GUID_DEFINED */
#endif /* NDIS_MINIPORT_DRIVER || _MSC_VER */ #endif /* NDIS_MINIPORT_DRIVER || _MSC_VER */

4
reactos/include/ole32/guiddef.h
View file

@ -43,8 +43,8 @@ Cambridge, MA 02139, USA.
// guid definition // guid definition
#ifndef GUID_DEFINED #ifndef _GUID_DEFINED
#define GUID_DEFINED #define _GUID_DEFINED
typedef struct _GUID { typedef struct _GUID {
unsigned long Data1; unsigned long Data1;
unsigned short Data2; unsigned short Data2;

4
reactos/include/ole32/rpc.h
View file

@ -18,8 +18,8 @@ typedef long RPC_STATUS;
typedef void* I_RPC_HANDLE; typedef void* I_RPC_HANDLE;
#ifndef GUID_DEFINED #ifndef _GUID_DEFINED
#define GUID_DEFINED #define _GUID_DEFINED
typedef struct _GUID typedef struct _GUID
{ {
DWORD Data1; DWORD Data1;

7
reactos/include/structs.h
View file

@ -257,10 +257,13 @@ typedef struct {
DWORD bV4GammaBlue; DWORD bV4GammaBlue;
} BITMAPV4HEADER, *LPBITMAPV4HEADER, *PBITMAPV4HEADER; } BITMAPV4HEADER, *LPBITMAPV4HEADER, *PBITMAPV4HEADER;
#ifndef _BLOB_DEFINED
#define _BLOB_DEFINED
typedef struct _BLOB { typedef struct _BLOB {
ULONG cbSize; ULONG cbSize;
BYTE *pBlobData; BYTE *pBlobData;
} BLOB; } BLOB;
#endif
typedef struct _SHITEMID { typedef struct _SHITEMID {
USHORT cb; USHORT cb;
@ -2794,8 +2797,8 @@ typedef struct _SERVICE_ADDRESSES {
SERVICE_ADDRESS Addresses[1]; SERVICE_ADDRESS Addresses[1];
} SERVICE_ADDRESSES, *LPSERVICE_ADDRESSES; } SERVICE_ADDRESSES, *LPSERVICE_ADDRESSES;
#ifndef GUID_DEFINED #ifndef _GUID_DEFINED
#define GUID_DEFINED #define _GUID_DEFINED
typedef struct _GUID typedef struct _GUID
{ {
unsigned long Data1; unsigned long Data1;