nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'win32_winnt'

Browse Source
This commit is contained in:
Nick Mathewson 2012-05-16 09:56:49 -04:00
commit d5ccaa6e2b
7 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug5861 Normal file
View File

@ -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.

6
configure.in
View File

@ -796,8 +796,7 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , ,
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#define _WIN32_WINNT 0x400
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1300)
#include <winsock.h> #include <winsock.h>
@ -821,8 +820,7 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#define _WIN32_WINNT 0x400
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1300)
#include <winsock.h> #include <winsock.h>

5
src/common/aes.c
View File

@ -12,11 +12,8 @@
#include "orconfig.h" #include "orconfig.h"
#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1300)

5
src/common/compat.h
View File

@ -9,11 +9,8 @@
#include "orconfig.h" #include "orconfig.h"
#include "torint.h" #include "torint.h"
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1300)

5
src/common/crypto.c
View File

@ -13,11 +13,8 @@
#include "orconfig.h" #include "orconfig.h"
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>

5
src/common/tortls.c
View File

@ -22,11 +22,8 @@
#include <assert.h> #include <assert.h>
#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ #ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#if defined(_MSC_VER) && (_MSC_VER < 1300) #if defined(_MSC_VER) && (_MSC_VER < 1300)

5
src/or/or.h
View File

@ -23,11 +23,8 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#ifndef WIN32_WINNT
#define WIN32_WINNT 0x400
#endif
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x400 #define _WIN32_WINNT 0x0501
#endif #endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif