diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 22:52:23 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2003-11-19 22:52:23 (GMT) |
| commit | 4bae2d5e46b5135dba523616fd0960fc915eb120 (patch) | |
| tree | 730899029b05968513eadb26fe1e3c4ac22653d1 /Modules | |
| parent | bc2fbc74edf3f6c451b823329a66413d9fcf1c55 (diff) | |
| download | cpython-4bae2d5e46b5135dba523616fd0960fc915eb120.zip cpython-4bae2d5e46b5135dba523616fd0960fc915eb120.tar.gz cpython-4bae2d5e46b5135dba523616fd0960fc915eb120.tar.bz2 | |
Getting rid of code dependent on GUSI or the MetroWerks compiler.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_localemodule.c | 2 | ||||
| -rw-r--r-- | Modules/errnomodule.c | 5 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 5 | ||||
| -rw-r--r-- | Modules/structmodule.c | 9 |
4 files changed, 1 insertions, 20 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 5862c1e..9f185be 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -34,7 +34,7 @@ This software comes with no warranty. Use at your own risk. #include <windows.h> #endif -#if defined(__APPLE__) || defined(__MWERKS__) +#if defined(__APPLE__) #include "macglue.h" #endif diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c index cd3d2fa..e9c0990 100644 --- a/Modules/errnomodule.c +++ b/Modules/errnomodule.c @@ -3,11 +3,6 @@ #include "Python.h" -/* Mac with GUSI has more errors than those in errno.h */ -#ifdef USE_GUSI -#include <sys/errno.h> -#endif - /* Windows socket errors (WSA*) */ #ifdef MS_WINDOWS #include <winsock.h> diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 427fb29..f93da4e 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -1739,11 +1739,6 @@ sock_makefile(PySocketSockObject *s, PyObject *args) SOCKETCLOSE(fd); return s->errorhandler(); } -#ifdef USE_GUSI2 - /* Workaround for bug in Metrowerks MSL vs. GUSI I/O library */ - if (strchr(mode, 'b') != NULL) - bufsize = 0; -#endif f = PyFile_FromFile(fp, "<socket>", mode, fclose); if (f != NULL) PyFile_SetBufSize(f, bufsize); diff --git a/Modules/structmodule.c b/Modules/structmodule.c index 22f1c54..b78231f 100644 --- a/Modules/structmodule.c +++ b/Modules/structmodule.c @@ -41,15 +41,6 @@ static PyObject *StructError; /* Define various structs to figure out the alignments of types */ -#ifdef __MWERKS__ -/* -** XXXX We have a problem here. There are no unique alignment rules -** on the PowerPC mac. -*/ -#ifdef __powerc -#pragma options align=mac68k -#endif -#endif /* __MWERKS__ */ typedef struct { char c; short x; } st_short; typedef struct { char c; int x; } st_int; |