commit 21e32619146db4602bc35acd0f237a91b43fd754 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 14 13:46:37 2012 -0400 Bump _WIN32_WINNT to 0x0501 throughout the code This tells the windows headers to give us definitions that didn't exist before XP -- like the ones that we need for IPv6 support. See bug #5861. We didn't run into this issue with mingw, since mingw doesn't respect _WIN32_WINNT as well as it should for some of its definitions. --- changes/bug5861 | 4 ++++ configure.in | 4 ++-- src/common/aes.c | 2 +- src/common/compat.h | 2 +- src/common/crypto.c | 2 +- src/common/tortls.c | 2 +- src/or/or.h | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changes/bug5861 b/changes/bug5861 new file mode 100644 index 0000000..74a1dfb --- /dev/null +++ b/changes/bug5861 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Set _WIN32_WINNT to 0x0501 consistently throughout the code, so + that IPv6 stuff will compile on MSVC, and compilation issues + will be easier to track down. Fix for bug 5861. diff --git a/configure.in b/configure.in index 92b7acb..43c9bb2 100644 --- a/configure.in +++ b/configure.in @@ -796,7 +796,7 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> @@ -820,7 +820,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <sys/socket.h> #endif #ifdef _WIN32 -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> diff --git a/src/common/aes.c b/src/common/aes.c index 692f1bc..1cb6b86 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -13,7 +13,7 @@ #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/compat.h b/src/common/compat.h index f17aa05..b0ef63b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -10,7 +10,7 @@ #include "torint.h" #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/common/crypto.c b/src/common/crypto.c index 8b1c9a6..f82598f 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -14,7 +14,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/src/common/tortls.c b/src/common/tortls.c index 180efa6..1120f3e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -23,7 +23,7 @@ #include <assert.h> #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) diff --git a/src/or/or.h b/src/or/or.h index ad0ac6d..76681c9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -24,7 +24,7 @@ #ifdef _WIN32 #ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x400 +#define _WIN32_WINNT 0x0501 #endif #define WIN32_LEAN_AND_MEAN #endif