[Python-checkins] python/dist/src/Modules bsddbmodule.c,1.36,1.37 mmapmodule.c,2.39,2.40 parsermodule.c,2.71,2.72 selectmodule.c,2.66,2.67 socketmodule.c,1.234,1.235 unicodedata.c,2.18,2.19 zlibmodule.c,2.64,2.65 _testcapimodule.c,1.16,1.17 _tkinter.c,1.126,1.127

mhammond@users.sourceforge.net mhammond@users.sourceforge.net
Mon, 22 Jul 2002 23:31:17 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv14945/Modules

Modified Files:
	bsddbmodule.c mmapmodule.c parsermodule.c selectmodule.c 
	socketmodule.c unicodedata.c zlibmodule.c _testcapimodule.c 
	_tkinter.c 
Log Message:
Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link 
command line for Windows builds.  This should allow MSVC to import and 
build the Python MSVC6 project files without error.


Index: bsddbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** bsddbmodule.c	17 Jul 2002 16:30:36 -0000	1.36
--- bsddbmodule.c	23 Jul 2002 06:31:12 -0000	1.37
***************
*** 842,846 ****
  };
  
! DL_EXPORT(void)
  initbsddb(void) {
  	PyObject *m, *d;
--- 842,846 ----
  };
  
! PyMODINIT_FUNC
  initbsddb(void) {
  	PyObject *m, *d;

Index: mmapmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mmapmodule.c,v
retrieving revision 2.39
retrieving revision 2.40
diff -C2 -d -r2.39 -r2.40
*** mmapmodule.c	30 Jun 2002 15:26:09 -0000	2.39
--- mmapmodule.c	23 Jul 2002 06:31:13 -0000	2.40
***************
*** 1052,1056 ****
  };
  
! DL_EXPORT(void)
  	initmmap(void)
  {
--- 1052,1056 ----
  };
  
! PyMODINIT_FUNC
  	initmmap(void)
  {

Index: parsermodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.71
retrieving revision 2.72
diff -C2 -d -r2.71 -r2.72
*** parsermodule.c	17 Jul 2002 16:30:37 -0000	2.71
--- parsermodule.c	23 Jul 2002 06:31:13 -0000	2.72
***************
*** 2853,2859 ****
  
  
! DL_EXPORT(void) initparser(void);  /* supply a prototype */
  
! DL_EXPORT(void)
  initparser(void)
  {
--- 2853,2859 ----
  
  
! PyMODINIT_FUNC initparser(void);  /* supply a prototype */
  
! PyMODINIT_FUNC
  initparser(void)
  {

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.66
retrieving revision 2.67
diff -C2 -d -r2.66 -r2.67
*** selectmodule.c	17 Jul 2002 16:49:03 -0000	2.66
--- selectmodule.c	23 Jul 2002 06:31:13 -0000	2.67
***************
*** 636,640 ****
  On Windows, only sockets are supported; on Unix, all file descriptors.");
  
! DL_EXPORT(void)
  initselect(void)
  {
--- 636,640 ----
  On Windows, only sockets are supported; on Unix, all file descriptors.");
  
! PyMODINIT_FUNC
  initselect(void)
  {

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** socketmodule.c	19 Jul 2002 12:44:59 -0000	1.234
--- socketmodule.c	23 Jul 2002 06:31:13 -0000	1.235
***************
*** 531,535 ****
  static double defaulttimeout = -1.0; /* Default timeout for new sockets */
  
! static void
  init_sockobject(PySocketSockObject *s,
  		SOCKET_T fd, int family, int type, int proto)
--- 531,535 ----
  static double defaulttimeout = -1.0; /* Default timeout for new sockets */
  
! PyMODINIT_FUNC
  init_sockobject(PySocketSockObject *s,
  		SOCKET_T fd, int family, int type, int proto)

Index: unicodedata.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/unicodedata.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** unicodedata.c	13 Jun 2002 20:32:53 -0000	2.18
--- unicodedata.c	23 Jul 2002 06:31:14 -0000	2.19
***************
*** 461,465 ****
  PyDoc_STRVAR(unicodedata_docstring, "unicode character database");
  
! DL_EXPORT(void)
  initunicodedata(void)
  {
--- 461,465 ----
  PyDoc_STRVAR(unicodedata_docstring, "unicode character database");
  
! PyMODINIT_FUNC
  initunicodedata(void)
  {

Index: zlibmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -d -r2.64 -r2.65
*** zlibmodule.c	17 Jul 2002 16:49:03 -0000	2.64
--- zlibmodule.c	23 Jul 2002 06:31:14 -0000	2.65
***************
*** 835,839 ****
  "objects support decompress() and flush().");
  
! DL_EXPORT(void)
  PyInit_zlib(void)
  {
--- 835,839 ----
  "objects support decompress() and flush().");
  
! PyMODINIT_FUNC
  PyInit_zlib(void)
  {

Index: _testcapimodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_testcapimodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** _testcapimodule.c	1 Apr 2002 14:28:58 -0000	1.16
--- _testcapimodule.c	23 Jul 2002 06:31:14 -0000	1.17
***************
*** 377,381 ****
  };
  
! DL_EXPORT(void)
  init_testcapi(void)
  {
--- 377,381 ----
  };
  
! PyMODINIT_FUNC
  init_testcapi(void)
  {

Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** _tkinter.c	17 Jul 2002 16:30:35 -0000	1.126
--- _tkinter.c	23 Jul 2002 06:31:14 -0000	1.127
***************
*** 2110,2114 ****
  
  
! DL_EXPORT(void)
  init_tkinter(void)
  {
--- 2110,2114 ----
  
  
! PyMODINIT_FUNC
  init_tkinter(void)
  {