- Move out LPCGUID from scsiwmi.h to basetyps.h where it belongs.

- Fix initguid.h to eliminate warnings when compiling C programs.

svn path=/trunk/; revision=10600
This commit is contained in:
Filip Navara 2004-08-19 18:16:39 +00:00
parent d2f7f5c128
commit 4376799eac
3 changed files with 9 additions and 6 deletions

View file

@ -113,6 +113,10 @@ typedef struct _GUID
unsigned char Data4[8];
} GUID,*REFGUID,*LPGUID;
#endif /* GUID_DEFINED */
#ifndef LPCGUID_DEFINED
#define LPCGUID_DEFINED
typedef const GUID *LPCGUID;
#endif
#ifndef UUID_DEFINED
#define UUID_DEFINED
typedef GUID UUID;

View file

@ -60,11 +60,6 @@ typedef struct _GUID {
} GUID;
#endif
#ifndef _LPCGUID_DEFINED
#define _LPCGUID_DEFINED
typedef const GUID *LPCGUID;
#endif
typedef struct _SCSIWMIGUIDREGINFO {
LPCGUID Guid;
ULONG InstanceCount;

View file

@ -8,5 +8,9 @@
#include <basetyps.h>
#endif
#undef DEFINE_GUID
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
#ifdef __cplusplus
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) extern const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
#else
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
#endif
#endif