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.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index ca7a9c1e3a5b150b8e6b94aa225a081093ee1b68..c3f03b105109b851de23af99bf98a9053d1de37e 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -187,7 +187,12 @@ Socket methods:
 #include <GUSI.h>
 #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"
+#endif /* ifndef MS_WINDOWS hack */
 
 #ifdef USE_SSL
 #include "openssl/rsa.h"
@@ -198,6 +203,11 @@ Socket methods:
 #include "openssl/err.h"
 #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... */
 #ifndef HAVE_GETADDRINFO
 #include "getaddrinfo.c"
@@ -206,6 +216,8 @@ Socket methods:
 #include "getnameinfo.c"
 #endif
 
+#endif /* ifndef MS_WINDOWS hack */
+
 #if defined(MS_WINDOWS) || defined(__BEOS__)
 /* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
 /* seem to be a few differences in the API */