[Python-checkins] python/dist/src/Modules _localemodule.c, 2.42, 2.43 errnomodule.c, 2.18, 2.19 socketmodule.c, 1.277, 1.278 structmodule.c, 2.60, 2.61

Wed Nov 19 17:52:25 EST 2003

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv4143/Modules
Modified Files:
	_localemodule.c errnomodule.c socketmodule.c structmodule.c 
Log Message:
Getting rid of code dependent on GUSI or the MetroWerks compiler.
Index: _localemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -d -r2.42 -r2.43
*** _localemodule.c	4 Sep 2003 18:24:47 -0000	2.42
--- _localemodule.c	19 Nov 2003 22:52:23 -0000	2.43
***************
*** 35,39 ****
 #endif
 
! #if defined(__APPLE__) || defined(__MWERKS__)
 #include "macglue.h"
 #endif
--- 35,39 ----
 #endif
 
! #if defined(__APPLE__)
 #include "macglue.h"
 #endif
Index: errnomodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/errnomodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** errnomodule.c	2 Aug 2002 02:27:13 -0000	2.18
--- errnomodule.c	19 Nov 2003 22:52:23 -0000	2.19
***************
*** 4,12 ****
 #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
--- 4,7 ----
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -C2 -d -r1.277 -r1.278
*** socketmodule.c	20 Oct 2003 14:01:54 -0000	1.277
--- socketmodule.c	19 Nov 2003 22:52:23 -0000	1.278
***************
*** 1740,1748 ****
 		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)
--- 1740,1743 ----
Index: structmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -d -r2.60 -r2.61
*** structmodule.c	29 Mar 2003 10:04:55 -0000	2.60
--- structmodule.c	19 Nov 2003 22:52:23 -0000	2.61
***************
*** 42,54 ****
 /* 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;
--- 42,45 ----