* include/winnt.h (VerSetConditionMask): Correct typo in _WIN32_WINNT

	guard.
	* lib/kernel32.def (VerSetConditionMask): Correct stdcall
	suffix.
	* lib/ddk/ntoskrnl.def (VerSetConditionMask): Likewise.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index d2565db..a99cd40 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-21  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/winnt.h (VerSetConditionMask): Correct typo in _WIN32_WINNT
+       guard.
+       * lib/kernel32.def (VerSetConditionMask): Correct stdcall
+       suffix.
+       * lib/ddk/ntoskrnl.def (VerSetConditionMask): Likewise.
+
 2004-11-20  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/winbase.h (PPROCESS_INFORMATION): Add typedef.

diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 01fe572..7f4cb32 100644 (file)
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -3320,11 +3320,10 @@ typedef OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
 typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
 #endif
 
-#if (WIN32_WINNT >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
 #endif
 
-
 PVOID GetCurrentFiber(void);
 PVOID GetFiberData(void);
 

diff --git a/winsup/w32api/lib/ddk/ntoskrnl.def b/winsup/w32api/lib/ddk/ntoskrnl.def
index 029d0de..ca1447f 100644 (file)
--- a/winsup/w32api/lib/ddk/ntoskrnl.def
+++ b/winsup/w32api/lib/ddk/ntoskrnl.def
@@ -1231,7 +1231,7 @@ SeTokenObjectType DATA
 ;SeUnlockSubjectContext
 ;SeUnregisterLogonSessionTerminatedRoutine
 SeValidSecurityDescriptor@8
-VerSetConditionMask@12
+VerSetConditionMask@16
 ;VfFailDeviceNode
 ;VfFailDriver
 ;VfFailSystemBIOS

diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index f22e83c..6d74c94 100644 (file)
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -782,7 +782,7 @@ VDMConsoleOperation@8
 VDMOperationStarted@4
 VerLanguageNameA@12
 VerLanguageNameW@12
-VerSetConditionMask@13
+VerSetConditionMask@16
 VerifyConsoleIoHandle@4
 VerifyVersionInfoA@16
 VerifyVersionInfoW@16