diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2003-02-05 18:51:27 +0300 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2003-02-05 18:51:27 +0300 |
| commit | 33c7867ef117710ac341c3d816d92e76d6cf7e9e (patch) | |
| tree | 0e46971e0dd215cc73a682bc0751dd7e03733044 /winsup/w32api/include/basetyps.h | |
| parent | cadd065b635f61ca9d4ca3ec012c65e597ca29f0 (diff) | |
* include/basetypes.h (_GUID_DEFINED): Add deprecation warning, start
using GUID_DEFINED instead.
* include/sqltypes.h: Ditto.
* include/winnt.h: Ditto.
* include/ddk/scsiwmi.h: Ditto.
Diffstat (limited to 'winsup/w32api/include/basetyps.h')
| -rw-r--r-- | winsup/w32api/include/basetyps.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h index e1e36501b..a5daba4e5 100644 --- a/winsup/w32api/include/basetyps.h +++ b/winsup/w32api/include/basetyps.h @@ -81,8 +81,12 @@ DECLARE_INTERFACE_(I,IUnknown) \ #endif /* __OBJC__ */ -#ifndef _GUID_DEFINED /* also defined in winnt.h */ -#define _GUID_DEFINED +#ifdef _GUID_DEFINED +# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead +#endif + +#if ! (defined _GUID_DEFINED || defined GUID_DEFINED) /* also defined in winnt.h */ +#define GUID_DEFINED typedef struct _GUID { unsigned long Data1; @@ -90,7 +94,7 @@ typedef struct _GUID unsigned short Data3; unsigned char Data4[8]; } GUID,*REFGUID,*LPGUID; -#endif /* _GUID_DEFINED */ +#endif /* GUID_DEFINED */ #ifndef UUID_DEFINED #define UUID_DEFINED typedef GUID UUID; |