new versions from Jim A

diff --git a/PC/config.c b/PC/config.c
index fed3745be8afe918a6025b98a4c9802a8746fd52..ffe6c7a507311799084059b67d1f7fbbcbcb593d 100644 (file)
--- a/PC/config.c
+++ b/PC/config.c
@@ -29,6 +29,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "Python.h"
 
+#ifndef MS_WIN16
+/* Assume all 32-bit platforms come standard with a WINSOCK library */
+#define USE_SOCKET
+#define USE_SELECT
+#endif
+
 extern void initarray();
 extern void initaudioop();
 extern void initbinascii();
@@ -41,8 +47,9 @@ extern void initnt();
 extern void initregex();
 extern void initrgbimg();
 extern void initrotor();
+extern void initselect();
 extern void initsignal();
-extern void initsocket();
+extern void init_socket();
 extern void initsoundex();
 extern void initstrop();
 extern void initstruct();
@@ -72,9 +79,12 @@ struct {
         {"regex", initregex},
         {"rgbimg", initrgbimg},
         {"rotor", initrotor},
+#ifdef USE_SELECT
+       {"select", initselect},
+#endif
         {"signal", initsignal},
 #ifdef USE_SOCKET
-       {"socket", initsocket},
+       {"_socket", init_socket},
 #endif
         {"soundex", initsoundex},
         {"strop", initstrop},

diff --git a/PC/config.h b/PC/config.h
index 3c382de9bedefc5fd57af11ecad00954edf41689..3a914904d4e1c615a3c22a014c7302c07c3e31aa 100644 (file)
--- a/PC/config.h
+++ b/PC/config.h
@@ -24,7 +24,6 @@ standard part of the Python distribution.
 #define HAVE_HYPOT
 #define DONT_HAVE_SIG_ALARM
 #define DONT_HAVE_SIG_PAUSE
-#define LONG_BIT       32
 
 /* Microsoft C defines _MSC_VER */
 
@@ -38,7 +37,6 @@ standard part of the Python distribution.
 #endif
 #define PYTHONPATH "c:\\python\\lib"
 typedef int pid_t;
-#define WORD_BIT 32
 #pragma warning(disable:4113)
 #define hypot _hypot
 #include <stdio.h>
@@ -48,7 +46,6 @@ typedef int pid_t;
 #define WITH_THREAD
 #ifndef NETSCAPE_PI
 #define USE_SOCKET
-#define _COMPLEX_DEFINED
 #endif
 #ifdef USE_DL_IMPORT
 #define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
@@ -65,8 +62,6 @@ typedef int pid_t;
 #define PYTHONPATH "c:\\python\\lib;c:\\python\\lib\\dos_8x3"
 #define IMPORT_8x3_NAMES
 typedef int pid_t;
-#define WORD_BIT 16
-#define _COMPLEX_DEFINED
 #pragma warning(disable:4113)
 #define memcpy memmove /* memcpy dangerous pointer wrap in Win 3.1 */
 #define hypot _hypot
@@ -111,11 +106,6 @@ int sscanf(const char *, const char *, ...);
 typedef int mode_t;
 typedef int uid_t;
 typedef int gid_t;
-#ifdef M_I386
-#define WORD_BIT 32
-#else
-#define WORD_BIT 16
-#endif
 #define VA_LIST_IS_ARRAY
 #define HAVE_CLOCK
 #define HAVE_STRFTIME