Commit 7e82b9cc authored by Tim Peters's avatar Tim Peters

Pure brute-force hackery to allow Python to build on Windows again,

because I need to make progress and don't have time now to think about
whatever it is the new code is trying to accomplish.
parent b9e9ff12
...@@ -187,7 +187,12 @@ Socket methods: ...@@ -187,7 +187,12 @@ Socket methods:
#include <GUSI.h> #include <GUSI.h>
#endif #endif
/* XXX 24-Jun-2000 Tim: I have no idea what the code inside this block is
trying to do, and don't have time to look. Looks like Unix-specific code
in those files, though, which will never compile on Windows. */
#ifndef MS_WINDOWS
#include "addrinfo.h" #include "addrinfo.h"
#endif /* ifndef MS_WINDOWS hack */
#ifdef USE_SSL #ifdef USE_SSL
#include "openssl/rsa.h" #include "openssl/rsa.h"
...@@ -198,6 +203,11 @@ Socket methods: ...@@ -198,6 +203,11 @@ Socket methods:
#include "openssl/err.h" #include "openssl/err.h"
#endif /* USE_SSL */ #endif /* USE_SSL */
/* XXX 24-Jun-2000 Tim: I have no idea what the code inside this block is
trying to do, and don't have time to look. Looks like Unix-specific code
in those files, though, which will never compile on Windows. */
#ifndef MS_WINDOWS
/* I know this is a bad practice, but it is the easiest... */ /* I know this is a bad practice, but it is the easiest... */
#ifndef HAVE_GETADDRINFO #ifndef HAVE_GETADDRINFO
#include "getaddrinfo.c" #include "getaddrinfo.c"
...@@ -206,6 +216,8 @@ Socket methods: ...@@ -206,6 +216,8 @@ Socket methods:
#include "getnameinfo.c" #include "getnameinfo.c"
#endif #endif
#endif /* ifndef MS_WINDOWS hack */
#if defined(MS_WINDOWS) || defined(__BEOS__) #if defined(MS_WINDOWS) || defined(__BEOS__)
/* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */ /* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
/* seem to be a few differences in the API */ /* seem to be a few differences in the API */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment