Commit 35932ad3 authored by Guido van Rossum's avatar Guido van Rossum

new versions from Jim A

parent 4601b726
...@@ -29,6 +29,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ...@@ -29,6 +29,12 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "Python.h" #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 initarray();
extern void initaudioop(); extern void initaudioop();
extern void initbinascii(); extern void initbinascii();
...@@ -41,8 +47,9 @@ extern void initnt(); ...@@ -41,8 +47,9 @@ extern void initnt();
extern void initregex(); extern void initregex();
extern void initrgbimg(); extern void initrgbimg();
extern void initrotor(); extern void initrotor();
extern void initselect();
extern void initsignal(); extern void initsignal();
extern void initsocket(); extern void init_socket();
extern void initsoundex(); extern void initsoundex();
extern void initstrop(); extern void initstrop();
extern void initstruct(); extern void initstruct();
...@@ -72,9 +79,12 @@ struct { ...@@ -72,9 +79,12 @@ struct {
{"regex", initregex}, {"regex", initregex},
{"rgbimg", initrgbimg}, {"rgbimg", initrgbimg},
{"rotor", initrotor}, {"rotor", initrotor},
#ifdef USE_SELECT
{"select", initselect},
#endif
{"signal", initsignal}, {"signal", initsignal},
#ifdef USE_SOCKET #ifdef USE_SOCKET
{"socket", initsocket}, {"_socket", init_socket},
#endif #endif
{"soundex", initsoundex}, {"soundex", initsoundex},
{"strop", initstrop}, {"strop", initstrop},
......
...@@ -24,7 +24,6 @@ standard part of the Python distribution. ...@@ -24,7 +24,6 @@ standard part of the Python distribution.
#define HAVE_HYPOT #define HAVE_HYPOT
#define DONT_HAVE_SIG_ALARM #define DONT_HAVE_SIG_ALARM
#define DONT_HAVE_SIG_PAUSE #define DONT_HAVE_SIG_PAUSE
#define LONG_BIT 32
/* Microsoft C defines _MSC_VER */ /* Microsoft C defines _MSC_VER */
...@@ -38,7 +37,6 @@ standard part of the Python distribution. ...@@ -38,7 +37,6 @@ standard part of the Python distribution.
#endif #endif
#define PYTHONPATH "c:\\python\\lib" #define PYTHONPATH "c:\\python\\lib"
typedef int pid_t; typedef int pid_t;
#define WORD_BIT 32
#pragma warning(disable:4113) #pragma warning(disable:4113)
#define hypot _hypot #define hypot _hypot
#include <stdio.h> #include <stdio.h>
...@@ -48,7 +46,6 @@ typedef int pid_t; ...@@ -48,7 +46,6 @@ typedef int pid_t;
#define WITH_THREAD #define WITH_THREAD
#ifndef NETSCAPE_PI #ifndef NETSCAPE_PI
#define USE_SOCKET #define USE_SOCKET
#define _COMPLEX_DEFINED
#endif #endif
#ifdef USE_DL_IMPORT #ifdef USE_DL_IMPORT
#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE #define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
...@@ -65,8 +62,6 @@ typedef int pid_t; ...@@ -65,8 +62,6 @@ typedef int pid_t;
#define PYTHONPATH "c:\\python\\lib;c:\\python\\lib\\dos_8x3" #define PYTHONPATH "c:\\python\\lib;c:\\python\\lib\\dos_8x3"
#define IMPORT_8x3_NAMES #define IMPORT_8x3_NAMES
typedef int pid_t; typedef int pid_t;
#define WORD_BIT 16
#define _COMPLEX_DEFINED
#pragma warning(disable:4113) #pragma warning(disable:4113)
#define memcpy memmove /* memcpy dangerous pointer wrap in Win 3.1 */ #define memcpy memmove /* memcpy dangerous pointer wrap in Win 3.1 */
#define hypot _hypot #define hypot _hypot
...@@ -111,11 +106,6 @@ int sscanf(const char *, const char *, ...); ...@@ -111,11 +106,6 @@ int sscanf(const char *, const char *, ...);
typedef int mode_t; typedef int mode_t;
typedef int uid_t; typedef int uid_t;
typedef int gid_t; typedef int gid_t;
#ifdef M_I386
#define WORD_BIT 32
#else
#define WORD_BIT 16
#endif
#define VA_LIST_IS_ARRAY #define VA_LIST_IS_ARRAY
#define HAVE_CLOCK #define HAVE_CLOCK
#define HAVE_STRFTIME #define HAVE_STRFTIME
......
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