windows-vista-sdk-ntsecapi-compat-20070403

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

diff --git a/src/WINNT/afsd/afskfw-int.h b/src/WINNT/afsd/afskfw-int.h
index e975f2ff0bb0a2f7864a83e23c8665ea392985f5..ca778f0c2cc08889ee3784839b62d68e33b87d28 100644 (file)
--- 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 465708e318101cb3ac001a43ee0c569f2b2f6c9e..4aa2fb4a5bf7d94986f22a7aee2b1f49bcfe246d 100644 (file)
--- 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 8d529759d51949d545f7c53faeb3bfc02ed763ce..ecc7234c1272fccca22e0b702360ef6f2271646e 100644 (file)
--- 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 a9febaa06a5ef838413b1e9f918cd290b6b970fe..9e3194a06b2709a768a5abd0ec1176fd833ec101 100644 (file)
--- 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 d1cb06a243030b2e21a1bf3cab80b6300215e128..b355d9521f3b152c5ec12562b2414ecfb8a06670 100644 (file)
--- a/src/WINNT/afsd/smb.h
+++ b/src/WINNT/afsd/smb.h
@@ -11,16 +11,10 @@
 #define __SMB_H_ENV__ 1
 
 #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