From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 24 Mar 2007 05:03:11 +0000 (+0000)
Subject: DEVEL15-windows-vista-sdk-ntsecapi-compat-20070324
X-Git-Tag: openafs-devel-1_5_18~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3031a7ca2e7b7c2f180839765b17c76216718652;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-vista-sdk-ntsecapi-compat-20070324


When loading the Vista SDK ntsecapi.h we must set _WIN32_WINNT
to 0x0501 or greater


(cherry picked from commit a6cb25c5d34db370e73d5e0044eaa88cf291228a)
---

diff --git a/src/WINNT/afsd/afskfw-int.h b/src/WINNT/afsd/afskfw-int.h
index d787112fc..e975f2ff0 100644
--- a/src/WINNT/afsd/afskfw-int.h
+++ b/src/WINNT/afsd/afskfw-int.h
@@ -62,7 +62,17 @@
 #ifdef USE_MS2MIT
 #define SECURITY_WIN32
 #include <security.h>
+#if _WIN32_WINNT < 0x0501
+#define AFS_WIN32_WINNT _WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
 #include <ntsecapi.h>
+#ifdef AFS_WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT AFS_WIN32_WINNT
+#undef AFS_WIN32_WINNT
+#endif
 #endif /* USE_MS2MIT */
 #include <stdio.h>
 #include <string.h>
diff --git a/src/WINNT/afsd/afslogon.h b/src/WINNT/afsd/afslogon.h
index 46065c336..a5ed23afc 100644
--- a/src/WINNT/afsd/afslogon.h
+++ b/src/WINNT/afsd/afslogon.h
@@ -28,7 +28,17 @@ SOFTWARE.
 
 #include <windows.h>
 #include <npapi.h>
+#if _WIN32_WINNT < 0x0501
+#define AFS_WIN32_WINNT _WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
 #include <ntsecapi.h>
+#ifdef AFS_WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT AFS_WIN32_WINNT
+#undef AFS_WIN32_WINNT
+#endif
 #include <tchar.h>
 #include <strsafe.h>
 
diff --git a/src/WINNT/afsd/smb.h b/src/WINNT/afsd/smb.h
index ebb5e0974..3782909f1 100644
--- a/src/WINNT/afsd/smb.h
+++ b/src/WINNT/afsd/smb.h
@@ -14,7 +14,17 @@
 #include "netbios95.h"
 #endif /* DJGPP */
 
+#if _WIN32_WINNT < 0x0501
+#define AFS_WIN32_WINNT _WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
 #include <ntsecapi.h>
+#ifdef AFS_WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT AFS_WIN32_WINNT
+#undef AFS_WIN32_WINNT
+#endif
 
 /* Support largefiles by default */
 #define AFS_LARGEFILES