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 | |
parent | bb9cc3dba0720ccee309ce3af19c370760611f1f (diff) | |
download | newlib-9d2dfde225976ab76ec67ebc8d1e593cf834e459.zip newlib-9d2dfde225976ab76ec67ebc8d1e593cf834e459.tar.gz newlib-9d2dfde225976ab76ec67ebc8d1e593cf834e459.tar.bz2 |
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')
-rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
-rw-r--r-- | winsup/w32api/include/winbase.h | 42 | ||||
-rw-r--r-- | winsup/w32api/include/winnt.h | 17 |
3 files changed, 15 insertions, 52 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index a2ad39e..a4eceb6 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +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. + 2001-12-03 Earnie Boyd <earnie@users.sf.net> * include/accctrl.h: Change \r\n to \n. diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index a71c115..1772c38 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -838,48 +838,6 @@ typedef struct _TIME_ZONE_INFORMATION { SYSTEMTIME DaylightDate; LONG DaylightBias; } TIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION; -typedef struct _OSVERSIONINFOA { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - CHAR szCSDVersion[128]; -} OSVERSIONINFOA,*POSVERSIONINFOA,*LPOSVERSIONINFOA; -typedef struct _OSVERSIONINFOW { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - WCHAR szCSDVersion[128]; -} OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW; -typedef struct _OSVERSIONINFOEXA { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - CHAR szCSDVersion[128]; - WORD wServicePackMajor; - WORD wServicePackMinor; - WORD wSuiteMask; - BYTE wProductType; - BYTE wReserved; -} OSVERSIONINFOEXA,*POSVERSIONINFOEXA,*LPOSVERSIONINFOEXA; -typedef struct _OSVERSIONINFOEXW { - DWORD dwOSVersionInfoSize; - DWORD dwMajorVersion; - DWORD dwMinorVersion; - DWORD dwBuildNumber; - DWORD dwPlatformId; - WCHAR szCSDVersion[128]; - WORD wServicePackMajor; - WORD wServicePackMinor; - WORD wSuiteMask; - BYTE wProductType; - BYTE wReserved; -} OSVERSIONINFOEXW,*POSVERSIONINFOEXW,*LPOSVERSIONINFOEXW; typedef struct _MEMORYSTATUS { DWORD dwLength; DWORD dwMemoryLoad; diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index a88605d..a777334 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 */ |