Make WIN32_WINNT defines conditional

Requested by Gisle Vanem on tor-dev.  I'm not quite sure this is the
right solution, but it's probably harmless.

diff --git a/changes/ifdef-winnt b/changes/ifdef-winnt
new file mode 100644 (file)
index 0000000..2c6c5a2
--- /dev/null
+++ b/changes/ifdef-winnt
@@ -0,0 +1,4 @@
+  o Build changes:
+    - On Windows, we now define the _WIN32_WINNT macros only if they
+      are not already defined. This lets the person building Tor decide,
+      if they want, to require a later version of Windows.

diff --git a/src/common/compat.h b/src/common/compat.h
index 094036dff2c1436fd98f5193268cbace1fa3393d..98642e2d922b5f1e79d3238f2fa658a567406c4a 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -9,8 +9,12 @@
 #include "orconfig.h"
 #include "torint.h"
 #ifdef MS_WINDOWS
+#ifndef WIN32_WINNT
 #define WIN32_WINNT 0x400
+#endif
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
+#endif
 #define WIN32_LEAN_AND_MEAN
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
 #include <winsock.h>

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 05c1ce9ea2ac1bb4003534ede3ef30808d95d6a1..9ad7575a7ec368cb8144bdbc9e02eab46f0bde74 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -13,8 +13,12 @@
 #include "orconfig.h"
 
 #ifdef MS_WINDOWS
+#ifndef WIN32_WINNT
 #define WIN32_WINNT 0x400
+#endif
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
+#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wincrypt.h>

diff --git a/src/common/tortls.c b/src/common/tortls.c
index a208bc7614b9445b43df5f2b2fca292a547ceadc..21f2c5072b3312ac25de31508ed734a8df4e30ef 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -22,8 +22,12 @@
 
 #include <assert.h>
 #ifdef MS_WINDOWS /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
+ #ifndef WIN32_WINNT
  #define WIN32_WINNT 0x400
+ #endif
+ #ifndef _WIN32_WINNT
  #define _WIN32_WINNT 0x400
+ #endif
  #define WIN32_LEAN_AND_MEAN
  #if defined(_MSC_VER) && (_MSC_VER < 1300)
     #include <winsock.h>

diff --git a/src/or/or.h b/src/or/or.h
index 7669efb665639ec73511fa4949aa22bd1b5539c5..7a2bde59fef2af2963d427410481858f18d7c100 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -23,8 +23,12 @@
 #endif
 
 #ifdef MS_WINDOWS
+#ifndef WIN32_WINNT
 #define WIN32_WINNT 0x400
+#endif
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x400
+#endif
 #define WIN32_LEAN_AND_MEAN
 #endif