Excise DL_EXPORT/DL_IMPORT from Modules/*. Required adding a prototype

mhammond · mhammond · commit fe51c6d66e0f · 2002-08-02T02:27:13.000Z
for Py_Main().

Thanks to Kalle Svensson and Skip Montanaro for the patches.
diff --git a/Include/pythonrun.h b/Include/pythonrun.h
@@ -78,6 +78,9 @@ DL_IMPORT(void) Py_Exit(int);
 
 DL_IMPORT(int) Py_FdIsInteractive(FILE *, char *);
 
+/* Bootstrap */
+PyAPI_FUNC(int) Py_Main(int argc, char **argv);
+
 /* In getpath.c */
 PyAPI_FUNC(char *) Py_GetProgramFullPath(void);
 PyAPI_FUNC(char *) Py_GetPrefix(void);
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
@@ -703,7 +703,7 @@ static PyMethodDef _codecs_functions[] = {
     {NULL, NULL}		/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_codecs(void)
 {
     Py_InitModule("_codecs", _codecs_functions);
diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
@@ -445,7 +445,7 @@ static PyMethodDef PyCurses_methods[] = {
 
 /* Initialization function for the module */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_curses_panel(void)
 {
     PyObject *m, *d, *v;
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -2474,7 +2474,7 @@ static PyMethodDef PyCurses_methods[] = {
 
 /* Initialization function for the module */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_curses(void)
 {
 	PyObject *m, *d, *v, *c_api_object;
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -649,7 +649,7 @@ static struct PyMethodDef PyLocale_Methods[] = {
   {NULL, NULL}
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_locale(void)
 {
     PyObject *m, *d, *x;
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -473,7 +473,7 @@ PyDoc_STRVAR(module_doc,
 "Implementation module for SSL socket operations.  See the socket module\n\
 for documentation.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_ssl(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/_weakref.c b/Modules/_weakref.c
@@ -109,7 +109,7 @@ weakref_functions[] =  {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_weakref(void)
 {
     PyObject *m;
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -1908,7 +1908,7 @@ static PyMethodDef a_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initarray(void)
 {
 	PyObject *m;
diff --git a/Modules/audioop.c b/Modules/audioop.c
@@ -1369,7 +1369,7 @@ static PyMethodDef audioop_methods[] = {
 	{ 0,          0 }
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initaudioop(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/binascii.c b/Modules/binascii.c
@@ -1313,7 +1313,7 @@ static struct PyMethodDef binascii_module_methods[] = {
 /* Initialization function for the module (*must* be called initbinascii) */
 PyDoc_STRVAR(doc_binascii, "Conversion between binary data and ASCII");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initbinascii(void)
 {
 	PyObject *m, *d, *x;
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
@@ -4789,10 +4789,10 @@ init_stuff(PyObject *module_dict)
 	return 0;
 }
 
-#ifndef DL_EXPORT	/* declarations for DLL import/export */
-#define DL_EXPORT(RTYPE) RTYPE
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
 #endif
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initcPickle(void) 
 {
 	PyObject *m, *d, *di, *v, *k;
diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
@@ -701,10 +701,10 @@ static struct PycStringIO_CAPI CAPI = {
   &Otype,
 };
 
-#ifndef DL_EXPORT	/* declarations for DLL import/export */
-#define DL_EXPORT(RTYPE) RTYPE
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
 #endif
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initcStringIO(void) {
   PyObject *m, *d, *v;
 
diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c
@@ -391,7 +391,7 @@ static PyMethodDef cmath_methods[] = {
 	{NULL,		NULL}		/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initcmath(void)
 {
 	PyObject *m;
diff --git a/Modules/cryptmodule.c b/Modules/cryptmodule.c
@@ -37,7 +37,7 @@ static PyMethodDef crypt_methods[] = {
 	{NULL,		NULL}		/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initcrypt(void)
 {
 	Py_InitModule("crypt", crypt_methods);
diff --git a/Modules/dbmmodule.c b/Modules/dbmmodule.c
@@ -339,7 +339,7 @@ static PyMethodDef dbmmodule_methods[] = {
 	{ 0, 0 },
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initdbm(void) {
 	PyObject *m, *d, *s;
 
diff --git a/Modules/dlmodule.c b/Modules/dlmodule.c
@@ -209,7 +209,7 @@ insint(PyObject *d, char *name, int value)
 	Py_XDECREF(v);
 }
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initdl(void)
 {
 	PyObject *m, *d, *x;
diff --git a/Modules/errnomodule.c b/Modules/errnomodule.c
@@ -57,7 +57,7 @@ Symbols that are not relevant to the underlying system are not defined.\n\
 To map error codes to error messages, use the function os.strerror(),\n\
 e.g. os.strerror(2) could return 'No such file or directory'.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initerrno(void)
 {
 	PyObject *m, *d, *de;
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
@@ -462,7 +462,7 @@ all_ins(PyObject* d)
 	return 0;
 }
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initfcntl(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/flmodule.c b/Modules/flmodule.c
@@ -2126,7 +2126,7 @@ static PyMethodDef forms_methods[] = {
 	{NULL,			NULL}		/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initfl(void)
 {
 	Py_InitModule("fl", forms_methods);
diff --git a/Modules/fpectlmodule.c b/Modules/fpectlmodule.c
@@ -86,7 +86,7 @@ static Sigfunc sigfpe_handler;
 static void fpe_reset(Sigfunc *);
 
 static PyObject *fpe_error;
-DL_EXPORT(void) initfpectl(void);
+PyMODINIT_FUNC initfpectl(void);
 static PyObject *turnon_sigfpe            (PyObject *self,PyObject *args);
 static PyObject *turnoff_sigfpe           (PyObject *self,PyObject *args);
 
@@ -249,7 +249,7 @@ static void sigfpe_handler(int signo)
     }
 }
 
-DL_EXPORT(void) initfpectl(void)
+PyMODINIT_FUNC initfpectl(void)
 {
     PyObject *m, *d;
     m = Py_InitModule("fpectl", fpectl_methods);
diff --git a/Modules/fpetestmodule.c b/Modules/fpetestmodule.c
@@ -44,7 +44,7 @@
 #include "Python.h"
 
 static PyObject *fpe_error;
-DL_EXPORT(void) initfpetest(void);
+PyMODINIT_FUNC initfpetest(void);
 static PyObject *test(PyObject *self,PyObject *args);
 static double db0(double);
 static double overflow(double);
@@ -172,7 +172,7 @@ static double overflow(double b)
   return a;
 }
 
-DL_EXPORT(void) initfpetest(void)
+PyMODINIT_FUNC initfpetest(void)
 {
     PyObject *m, *d;
 
diff --git a/Modules/gdbmmodule.c b/Modules/gdbmmodule.c
@@ -504,7 +504,7 @@ static PyMethodDef dbmmodule_methods[] = {
     { 0, 0 },
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initgdbm(void) {
     PyObject *m, *d, *s;
 
diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
@@ -156,7 +156,7 @@ according to the password database.  Check both databases to get\n\
 complete membership information.)");
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initgrp(void)
 {
     PyObject *m, *d;
diff --git a/Modules/imageop.c b/Modules/imageop.c
@@ -696,7 +696,7 @@ static PyMethodDef imageop_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initimageop(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/main.c b/Modules/main.c
@@ -105,7 +105,7 @@ usage(int exitcode, char* program)
 
 /* Main program */
 
-DL_EXPORT(int)
+int
 Py_Main(int argc, char **argv)
 {
 	int c;
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
@@ -334,7 +334,7 @@ PyDoc_STRVAR(module_doc,
 "This module is always available.  It provides access to the\n"
 "mathematical functions defined by the C standard.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initmath(void)
 {
 	PyObject *m, *d, *v;
diff --git a/Modules/md5module.c b/Modules/md5module.c
@@ -253,7 +253,7 @@ static PyMethodDef md5_functions[] = {
 
 /* Initialize this module. */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initmd5(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/mpzmodule.c b/Modules/mpzmodule.c
@@ -1644,7 +1644,7 @@ void mp_free(void *ptr, size_t size)
 
 /* Initialize this module. */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initmpz(void)
 {
 	PyObject *module;
diff --git a/Modules/operator.c b/Modules/operator.c
@@ -219,7 +219,7 @@ spam2(ge,__ge__, "ge(a, b) -- Same as a>=b.")
 
 /* Initialization function for the module (*must* be called initoperator) */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initoperator(void)
 {
         /* Create the module and add the functions */
diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
@@ -610,7 +610,7 @@ insint(PyObject *d, char *name, int value)
 
 /* Initialization function for the module (*must* be called initpcre) */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initpcre(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -3211,6 +3211,7 @@ _PyPopenCreateProcess(char *cmdstring,
 {
 	PROCESS_INFORMATION piProcInfo;
 	STARTUPINFO siStartInfo;
+	DWORD dwProcessFlags = 0;  /* no NEW_CONSOLE by default for Ctrl+C handling */
 	char *s1,*s2, *s3 = " /c ";
 	const char *szConsoleSpawn = "w9xpopen.exe";
 	int i;
@@ -3303,6 +3304,16 @@ _PyPopenCreateProcess(char *cmdstring,
 				s1,
 				s3,
 				cmdstring);
+			/* Not passing CREATE_NEW_CONSOLE has been known to
+			   cause random failures on win9x.  Specifically a 
+			   dialog:
+			   "Your program accessed mem currently in use at xxx"
+			   and a hopeful warning about the stability of your
+			   system.
+			   Cost is Ctrl+C wont kill children, but anyone
+			   who cares can have a go!
+			*/
+			dwProcessFlags |= CREATE_NEW_CONSOLE;
 		}
 	}
 
@@ -3328,7 +3339,7 @@ _PyPopenCreateProcess(char *cmdstring,
 			  NULL,
 			  NULL,
 			  TRUE,
-			  0, /* no new console so Ctrl+C kills child too */
+			  dwProcessFlags,
 			  NULL,
 			  NULL,
 			  &siStartInfo,
@@ -6746,7 +6757,7 @@ all_ins(PyObject *d)
 #define MODNAME "posix"
 #endif
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 INITFUNC(void)
 {
 	PyObject *m, *v;
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
@@ -157,7 +157,7 @@ static PyMethodDef pwd_methods[] = {
 	{NULL,		NULL}		/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initpwd(void)
 {
 	PyObject *m;
diff --git a/Modules/python.c b/Modules/python.c
@@ -2,8 +2,6 @@
 
 #include "Python.h"
 
-extern DL_EXPORT(int) Py_Main(int, char **);
-
 int
 main(int argc, char **argv)
 {
diff --git a/Modules/readline.c b/Modules/readline.c
@@ -652,7 +652,7 @@ call_readline(char *prompt)
 PyDoc_STRVAR(doc_module,
 "Importing this module enables command line editing using GNU readline.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initreadline(void)
 {
 	PyObject *m;
diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
@@ -642,7 +642,7 @@ static struct PyMethodDef regex_global_methods[] = {
 	{NULL,		NULL}		     /* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initregex(void)
 {
 	PyObject *m, *d, *v;
diff --git a/Modules/resource.c b/Modules/resource.c
@@ -210,7 +210,7 @@ resource_methods[] = {
 
 /* Module initialization */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initresource(void)
 {
 	PyObject *m, *v;
diff --git a/Modules/rgbimgmodule.c b/Modules/rgbimgmodule.c
@@ -751,7 +751,7 @@ rgbimg_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initrgbimg(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/rotormodule.c b/Modules/rotormodule.c
diff --git a/Modules/shamodule.c b/Modules/shamodule.c
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c
diff --git a/Modules/structmodule.c b/Modules/structmodule.c
diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
diff --git a/Modules/termios.c b/Modules/termios.c
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
diff --git a/Modules/timingmodule.c b/Modules/timingmodule.c
diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c
diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c
diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c
diff --git a/PC/WinMain.c b/PC/WinMain.c

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ static PyMethodDef _codecs_functions[] = {`
`703`	`703`	`{NULL, NULL} /* sentinel */`
`704`	`704`	`};`
`705`	`705`
`706`		`-DL_EXPORT(void)`
	`706`	`+PyMODINIT_FUNC`
`707`	`707`	`init_codecs(void)`
`708`	`708`	`{`
`709`	`709`	`Py_InitModule("_codecs", _codecs_functions);`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ static PyMethodDef PyCurses_methods[] = {`
`445`	`445`
`446`	`446`	`/* Initialization function for the module */`
`447`	`447`
`448`		`-DL_EXPORT(void)`
	`448`	`+PyMODINIT_FUNC`
`449`	`449`	`init_curses_panel(void)`
`450`	`450`	`{`
`451`	`451`	`PyObject m, d, *v;`
Original file line number	Diff line number	Diff line change
`@@ -2474,7 +2474,7 @@ static PyMethodDef PyCurses_methods[] = {`
`2474`	`2474`
`2475`	`2475`	`/* Initialization function for the module */`
`2476`	`2476`
`2477`		`-DL_EXPORT(void)`
	`2477`	`+PyMODINIT_FUNC`
`2478`	`2478`	`init_curses(void)`
`2479`	`2479`	`{`
`2480`	`2480`	`PyObject m, d, v, c_api_object;`
Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ static struct PyMethodDef PyLocale_Methods[] = {`
`649`	`649`	`{NULL, NULL}`
`650`	`650`	`};`
`651`	`651`
`652`		`-DL_EXPORT(void)`
	`652`	`+PyMODINIT_FUNC`
`653`	`653`	`init_locale(void)`
`654`	`654`	`{`
`655`	`655`	`PyObject m, d, *x;`
Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ PyDoc_STRVAR(module_doc,`
`473`	`473`	`"Implementation module for SSL socket operations. See the socket module\n\`
`474`	`474`	`for documentation.");`
`475`	`475`
`476`		`-DL_EXPORT(void)`
	`476`	`+PyMODINIT_FUNC`
`477`	`477`	`init_ssl(void)`
`478`	`478`	`{`
`479`	`479`	`PyObject m, d;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ weakref_functions[] = {`
`109`	`109`	`};`
`110`	`110`
`111`	`111`
`112`		`-DL_EXPORT(void)`
	`112`	`+PyMODINIT_FUNC`
`113`	`113`	`init_weakref(void)`
`114`	`114`	`{`
`115`	`115`	`PyObject *m;`
Original file line number	Diff line number	Diff line change
`@@ -1908,7 +1908,7 @@ static PyMethodDef a_methods[] = {`
`1908`	`1908`	`};`
`1909`	`1909`
`1910`	`1910`
`1911`		`-DL_EXPORT(void)`
	`1911`	`+PyMODINIT_FUNC`
`1912`	`1912`	`initarray(void)`
`1913`	`1913`	`{`
`1914`	`1914`	`PyObject *m;`
Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,7 @@ static PyMethodDef audioop_methods[] = {`
`1369`	`1369`	`{ 0, 0 }`
`1370`	`1370`	`};`
`1371`	`1371`
`1372`		`-DL_EXPORT(void)`
	`1372`	`+PyMODINIT_FUNC`
`1373`	`1373`	`initaudioop(void)`
`1374`	`1374`	`{`
`1375`	`1375`	`PyObject m, d;`
Original file line number	Diff line number	Diff line change
`@@ -1313,7 +1313,7 @@ static struct PyMethodDef binascii_module_methods[] = {`
`1313`	`1313`	`/* Initialization function for the module (must be called initbinascii) */`
`1314`	`1314`	`PyDoc_STRVAR(doc_binascii, "Conversion between binary data and ASCII");`
`1315`	`1315`
`1316`		`-DL_EXPORT(void)`
	`1316`	`+PyMODINIT_FUNC`
`1317`	`1317`	`initbinascii(void)`
`1318`	`1318`	`{`
`1319`	`1319`	`PyObject m, d, *x;`