diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2003-02-05 15:51:27 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2003-02-05 15:51:27 +0000 |
| commit | 33c7867ef117710ac341c3d816d92e76d6cf7e9e (patch) | |
| tree | 0e46971e0dd215cc73a682bc0751dd7e03733044 /winsup/w32api/include/winnt.h | |
| parent | cadd065b635f61ca9d4ca3ec012c65e597ca29f0 (diff) | |
| download | cygnal-33c7867ef117710ac341c3d816d92e76d6cf7e9e.tar.gz cygnal-33c7867ef117710ac341c3d816d92e76d6cf7e9e.tar.bz2 cygnal-33c7867ef117710ac341c3d816d92e76d6cf7e9e.zip | |
* 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/winnt.h')
| -rw-r--r-- | winsup/w32api/include/winnt.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index 43fb038ba..88766ac0d 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -1152,8 +1152,13 @@ typedef DWORD FLONG; #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 #ifndef RC_INVOKED typedef DWORD ACCESS_MASK, *PACCESS_MASK; -#ifndef _GUID_DEFINED /* also defined in basetyps.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 basetyps.h */ +#define GUID_DEFINED typedef struct _GUID { unsigned long Data1; unsigned short Data2; @@ -1161,7 +1166,7 @@ typedef struct _GUID { unsigned char Data4[8]; } GUID, *REFGUID, *LPGUID; #define SYSTEM_LUID { QuadPart:999 } -#endif /* _GUID_DEFINED */ +#endif /* GUID_DEFINED */ typedef struct _GENERIC_MAPPING { ACCESS_MASK GenericRead; ACCESS_MASK GenericWrite; |