diff options
| author | Earnie Boyd <earnie@users.sf.net> | 2001-12-04 13:35:34 +0000 |
|---|---|---|
| committer | Earnie Boyd <earnie@users.sf.net> | 2001-12-04 13:35:34 +0000 |
| commit | 9d2dfde225976ab76ec67ebc8d1e593cf834e459 (patch) | |
| tree | 74338b99ffbb6b36a26decc678760c8318d037ad /winsup/w32api/include/winnt.h | |
| parent | bb9cc3dba0720ccee309ce3af19c370760611f1f (diff) | |
| download | cygnal-9d2dfde225976ab76ec67ebc8d1e593cf834e459.tar.gz cygnal-9d2dfde225976ab76ec67ebc8d1e593cf834e459.tar.bz2 cygnal-9d2dfde225976ab76ec67ebc8d1e593cf834e459.zip | |
2001-12-04 Danny Smith <dannysmith@users.sourceforge.net>
Cleanup merge between SourceForge and winsup CVS.
* include/winbase.h (OSVERSIONINFO[AW], OSVERSIONINFOEX[AW]: Remove
definitions.
* include/winnt.h (VER_NT*): Remove duplicate defines.
(VER_SUITE*): Group with VER_PLATFORM*, VER_NT* defines.
Diffstat (limited to 'winsup/w32api/include/winnt.h')
| -rw-r--r-- | winsup/w32api/include/winnt.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index a88605d98..a77733432 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -1065,6 +1065,13 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define VER_NT_WORKSTATION 1 #define VER_NT_DOMAIN_CONTROLLER 2 #define VER_NT_SERVER 3 +#define VER_SUITE_SMALLBUSINESS 1 +#define VER_SUITE_ENTERPRISE 2 +#define VER_SUITE_BACKOFFICE 4 +#define VER_SUITE_TERMINAL 16 +#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 +#define VER_SUITE_DATACENTER 128 +#define VER_SUITE_PERSONAL 512 #define BTYPE(x) ((x)&N_BTMASK) #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)) #define ISFCN(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_FUNCTION<<N_BTSHFT)) @@ -1086,16 +1093,6 @@ typedef BYTE BOOLEAN,*PBOOLEAN; #define IsReparseTagValid(x) (!((x)&~IO_REPARSE_TAG_VALID_VALUES)&&((x)>IO_REPARSE_TAG_RESERVED_RANGE)) #define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 -#define VER_NT_WORKSTATION 1 -#define VER_NT_DOMAIN_CONTROLLER 2 -#define VER_NT_SERVER 3 -#define VER_SUITE_SMALLBUSINESS 1 -#define VER_SUITE_ENTERPRISE 2 -#define VER_SUITE_BACKOFFICE 4 -#define VER_SUITE_TERMINAL 16 -#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32 -#define VER_SUITE_DATACENTER 128 -#define VER_SUITE_PERSONAL 512 #ifndef RC_INVOKED typedef DWORD ACCESS_MASK, *PACCESS_MASK; #ifndef _GUID_DEFINED /* also defined in basetyps.h */ |