diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/w32api/include/winbase.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/winnt.h | 14 |
3 files changed, 16 insertions, 8 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 135f0a5..af8821e 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2003-10-09 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + + * include/winbase.h (AddVectoredExceptionHandler): Define if + _WIN32_WINNT >= 0x0500. + + * include/winnt.h (PVECTORED_EXCEPTION_HANDLER): Define if + _WIN32_WINNT >= 0x0500. + 2003-10-08 Corinna Vinschen <corinna@vinschen.de> * include/winbase.h (AddVectoredExceptionHandler): Only define if diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 6318d2b..9b3aec1 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1061,7 +1061,7 @@ BOOL WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); #if (_WIN32_WINNT >= 0x0501) void WINAPI AddRefActCtx(HANDLE); #endif -#if (_WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0500) PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); #endif BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD); diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h index a497096..be6877a 100644 --- a/winsup/w32api/include/winnt.h +++ b/winsup/w32api/include/winnt.h @@ -2074,12 +2074,6 @@ typedef enum tagTOKEN_TYPE { TokenPrimary = 1, TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; -#if (_WIN32_WINNT >= 0x0501) -typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS); -typedef enum _HEAP_INFORMATION_CLASS { - HeapCompatibilityInformation -} HEAP_INFORMATION_CLASS; -#endif typedef struct _TOKEN_STATISTICS { LUID TokenId; LUID AuthenticationId; @@ -3167,6 +3161,9 @@ typedef enum _POWER_INFORMATION_LEVEL { ProcessorPowerPolicyCurrent } POWER_INFORMATION_LEVEL; +#if (_WIN32_WINNT >= 0x0500) +typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS); +#endif #if 1 /* (WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; @@ -3176,7 +3173,10 @@ typedef struct _SYSTEM_POWER_INFORMATION { } SYSTEM_POWER_INFORMATION,*PSYSTEM_POWER_INFORMATION; #endif -#if (WIN32_WINNT >= 0x0501) +#if (_WIN32_WINNT >= 0x0501) +typedef enum _HEAP_INFORMATION_CLASS { + HeapCompatibilityInformation +} HEAP_INFORMATION_CLASS; typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { ActivationContextBasicInformation = 1, ActivationContextDetailedInformation, |