From 6fb94bc61591981dd39092e3d17b616b7c9abbdf Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 3 Apr 2007 15:50:40 +0000
Subject: [PATCH] DEVEL15-windows-vista-sdk-ntsecapi-compat-20070403

There is no way to replace FOO with the value of BAR in cpp.


(cherry picked from commit c7c7242e78fd5035572b7d4f2071bf105190826c)
---
 src/WINNT/afsd/afskfw-int.h | 6 ------
 src/WINNT/afsd/afskfw.c     | 1 +
 src/WINNT/afsd/afslogon.h   | 6 ------
 src/WINNT/afsd/logon_ad.cpp | 4 ++++
 src/WINNT/afsd/smb.h        | 6 ------
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/WINNT/afsd/afskfw-int.h b/src/WINNT/afsd/afskfw-int.h
index e975f2ff0..ca778f0c2 100644
--- a/src/WINNT/afsd/afskfw-int.h
+++ b/src/WINNT/afsd/afskfw-int.h
@@ -63,16 +63,10 @@
 #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/afskfw.c b/src/WINNT/afsd/afskfw.c
index 465708e31..4aa2fb4a5 100644
--- a/src/WINNT/afsd/afskfw.c
+++ b/src/WINNT/afsd/afskfw.c
@@ -61,6 +61,7 @@
 #include "afskfw-int.h"
 #include "afskfw.h"
 #include <userenv.h>
+
 #include <Sddl.h>
 #include <Aclapi.h>
 
diff --git a/src/WINNT/afsd/afslogon.h b/src/WINNT/afsd/afslogon.h
index 8d529759d..ecc7234c1 100644
--- a/src/WINNT/afsd/afslogon.h
+++ b/src/WINNT/afsd/afslogon.h
@@ -30,16 +30,10 @@ SOFTWARE.
 #include <objbase.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/logon_ad.cpp b/src/WINNT/afsd/logon_ad.cpp
index a9febaa06..9e3194a06 100644
--- a/src/WINNT/afsd/logon_ad.cpp
+++ b/src/WINNT/afsd/logon_ad.cpp
@@ -29,6 +29,10 @@ SOFTWARE.
 #define SECURITY_WIN32
 #include "afslogon.h"
 
+#if (_WIN32_WINNT < 0x0500)
+#error _WIN32_WINNT < 0x0500
+#endif
+
 /**/
 #include <security.h>
 #include <sddl.h>
diff --git a/src/WINNT/afsd/smb.h b/src/WINNT/afsd/smb.h
index 3782909f1..1c56143df 100644
--- a/src/WINNT/afsd/smb.h
+++ b/src/WINNT/afsd/smb.h
@@ -15,16 +15,10 @@
 #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
-- 
2.39.5