diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-29 12:55:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-29 12:55:03 -0400 |
| commit | d9052c629b94343aef63f4e8c891c9c0a9c097b5 (patch) | |
| tree | ab5ad9fdf4f329764282104566deacb94d97738c /configure.ac | |
| parent | 66c73abe039611073d6086e617999d56ac8e73bd (diff) | |
| download | tor-d9052c629b94343aef63f4e8c891c9c0a9c097b5.tar.gz tor-d9052c629b94343aef63f4e8c891c9c0a9c097b5.zip | |
Remove checks for visual C 6.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 23d4c98f5d..0f93e461f4 100644 --- a/configure.ac +++ b/configure.ac @@ -335,6 +335,12 @@ bwin32=true; AC_MSG_RESULT([yes]), bwin32=false; AC_MSG_RESULT([no])) fi +if test "$bwin32" = yes; then + AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [Defined to avoid including some windows headers]) + AC_DEFINE(WINVER, 0x0501, [Defined to access windows functions and definitions for >=WinXP]) + AC_DEFINE(_WIN32_WINNT, 0x0501, [Defined to access windows functions and definitions for >=WinXP]) +fi + AM_CONDITIONAL(BUILD_NT_SERVICES, test x$bwin32 = xtrue) dnl Enable C99 when compiling with MIPSpro @@ -1122,13 +1128,9 @@ AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t], , , #ifdef _WIN32 #define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif ]) AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct sockaddr_in.sin_len, struct sockaddr_in6.sin6_len], , , [#ifdef HAVE_SYS_TYPES_H @@ -1146,9 +1148,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #ifdef _WIN32 #define _WIN32_WINNT 0x0501 #define WIN32_LEAN_AND_MEAN -#if defined(_MSC_VER) && (_MSC_VER < 1300) -#include <winsock.h> -#else #include <winsock2.h> #include <ws2tcpip.h> #endif |