commit 7134be06379f2a964c0a84ecb7ac002f59ea3214 Author: Nick Mathewson nickm@torproject.org Date: Mon May 14 13:04:13 2012 -0400

MSVC build issue: add magic to make openssl headers in aes.c work --- src/common/aes.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c index c6bc2a8..a9a0188 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -10,6 +10,23 @@ **/

#include "orconfig.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 + #define _WIN32_WINNT 0x400 + #endif + #define WIN32_LEAN_AND_MEAN + #if defined(_MSC_VER) && (_MSC_VER < 1300) + #include <winsock.h> + #else + #include <winsock2.h> + #include <ws2tcpip.h> + #endif +#endif + #include <openssl/opensslv.h> #include <assert.h> #include <stdlib.h>