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

for Py_Main().

Thanks to Kalle Svensson and Skip Montanaro for the patches.

diff --git a/Include/pythonrun.h b/Include/pythonrun.h
index 2d7d2b6e9697733517a4dec80cab92e6a0a2c91e..7076dfea2bc982bd6e4b51449656ac95233bd391 100644 (file)
--- 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
index aed3c4293817fa690cab603946e6f4d97f7d8467..d663293e885a245fb7c68587ca08ee0e7494ea03 100644 (file)
--- 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
index e616d907735b8b165a2cb9474d6de165cee1c86e..08c5f09ade1930928492a0667addf8e705ff29c3 100644 (file)
--- 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
index f819a9e57f72374826e6cb89a6651ca06a357024..65f60f0d621f62877f6d0666889357bf8127f142 100644 (file)
--- 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
index 5ed3eaf73d936b327a4a0ee87d58b905d7dce911..ab86fa49adf0945aeacad4d8873310c1da005ba8 100644 (file)
--- 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
index baaa097a083c933733b282b36854cc5c850ccf06..ad0b59b894434efa0b183c8b705a38ec83d7d12d 100644 (file)
--- 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
index 31e63d1859fe0b802fc031d58f62cc348874de2e..86bd036cd36052db8767c0a398769793cda9c465 100644 (file)
--- 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
index e757d9f4943222b7b2745e3b6201668f6c55c2bb..5bb5e2ceee8f2ed9c7f915c555cb98cf57101e6c 100644 (file)
--- 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
index 9adbc7b45c7984d799885e97b458379476bd44d7..52824b84b6943adc7db6909a70086c686765854d 100644 (file)
--- 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
index ec07a7170a86ad0d71c0fa2bb3b6919aa4de7d7a..0fe85fca600601415ac8af2cc3ac225140f4c7b5 100644 (file)
--- 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
index a43d7b911665c5440ca57742e71e1e438d13d016..f8d9af85ac998d5a6f9b9b760bce5f466ee8215f 100644 (file)
--- 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
index 2f85f417d9f6abf5f375d7029cd5b2c0d616585f..dfab89a83bd22f75c411bddb0091b56c3eea27eb 100644 (file)
--- 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
index 5bb08f2913aaba764677c439cec00f67692a25f2..8faa6bf185f76eba8b4b5575c6bae11d694608fa 100644 (file)
--- 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
index a1eaced2180f7460a4be1239bc7e0551e97f0622..050a356912224b62daca8d4eead354ab8edb2be0 100644 (file)
--- 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
index dde5b49df33b7130cd69c5178035fc3d4b379bec..d05a1bd8494d5d72cb47c3e9d05be69767b28c5f 100644 (file)
--- 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
index ea083e2ee538e0d4ac8968bfeca1577dfcaca4dd..927f4c0ac8287e77540c0a1068da4f1fff2353d3 100644 (file)
--- 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
index 74d4f0f310c75ade4ce6d564c3e8eee57ed18bb3..cd3d2fab9b6609f44f4ee28602da3765059690f2 100644 (file)
--- 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
index f1d89cc7a76b3d4fe0b9323d20aa5cf103ca4817..360b54ee4cbbd7dd5ac867801a022d568461e82d 100644 (file)
--- 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
index b3e7d1f80929435cb1977a491e94db420ed429ca..2fe118d629f44cb462796deecc373fb3f951c8e9 100644 (file)
--- 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
index c4b85d164abc5c21a0dfe7781d57964adeccce11..c29bcef6555beb9d75e0be7f6f63cf675611dd72 100644 (file)
--- 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
index 565d0b7da9b63d8285c186dcb352b41db7e87be2..aa14dd82a6b294819521cf530cecb1335c4b118e 100644 (file)
--- 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
index 6e85ed34690ef8e9a3da4393f8c5064a471d86c6..accf43894bcf83d6b7f66ff20469652964912588 100644 (file)
--- 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
index c8340099404701728951b62126d2a781cae981bb..8a889685fcf9223cfd42bd09f4e389722f651af3 100644 (file)
--- 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
index 7b925b8ab9be450423f8f55b11c78d04f3b93310..8c83cc3cf27d1bc1fd4ac784c390c57c32c42534 100644 (file)
--- 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
index cc07c29a0221a9a7d6666355667c0bfa1eaba75a..cebb17b90d1b364f53b6c30bbb216993e7b19bf1 100644 (file)
--- 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
index 88b439f83771a8782a31d9fc5581eb06e14fd3c1..cbb00007ec8f2d0955590d9c778fadfd573909d5 100644 (file)
--- 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
index aa2bef8c4cc9d86c01ff7eac75e9b4e57f6c9658..8ca238635450c91c49ad740f26c6e3f135f0cd44 100644 (file)
--- 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
index 0cb6495642e74c05b5cdc5584b909304c573d193..5974df14d7b7a97e9384459b031fde423bd8c6e9 100644 (file)
--- 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
index fbe8c145aa443df2a053e8a4832bb749bc3b6d0a..c1bf468955efea102b74d444a2e0f0bda851b88d 100644 (file)
--- 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
index 383dde86b25c2e937c04d2cdae8a31e4a54557b7..656539a59172ff3d64856a34a79b2444b4627552 100644 (file)
--- 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
index bf178f87fccc48be40c53799506a6e8d7a9dfaf6..9b7640f19c8c7b5884fc6a16f530e4c6fb4b48ba 100644 (file)
--- 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
index b51b7f91e13e5b23907d91d890bc3c6f8ef89442..cb139bb036d6ef7d25d3f15daee2bb465b6894f2 100644 (file)
--- 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
index 316dd3b6636ca23e597f6825ab03c34b7b37fbfe..f9262e8a20a7ea50b9f21495abd3acad17aff8d4 100644 (file)
--- 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
index afd80db98e8f916cffa74ec781febda0f668f55a..a2efd47f626b32bd8c6351f439789d2f749d2488 100644 (file)
--- 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
index 4c7035e501ecb8a439c41112b79371f718d9e6f7..db541612e282787d3b2a0675833991efa3a5e408 100644 (file)
--- 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
index 5ed98a1f0a380a17d672ffa5519f7abda3145867..b1dd5d1f35bbe1249c2f2e0453f7e7bfe8dbe530 100644 (file)
--- 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
index 596ea4f6717c4ec8c001a58884dd6626e62e392f..904c64b642ec2fdec4e0ad12bc36ab58e8f82f37 100644 (file)
--- 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
index 7137b00b179a842ebab78f71097b9821f7d92758..dcca0c6174e2aa91437b3a6264e4fc754e374b3b 100644 (file)
--- a/Modules/rotormodule.c
+++ b/Modules/rotormodule.c
@@ -615,7 +615,7 @@ rotor_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initrotor(void)
 {
        Rotor_Type.ob_type = &PyType_Type;

diff --git a/Modules/shamodule.c b/Modules/shamodule.c
index 14e51ea6eb58fd3f9a85a8fa31392a25b5b0aecb..5b9040d9a6744d328253e5d474e7c540cf1ee740 100644 (file)
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -525,7 +525,7 @@ static struct PyMethodDef SHA_functions[] = {
 
 #define insint(n,v) { PyModule_AddIntConstant(m,n,v); }
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initsha(void)
 {
     PyObject *m;

diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 25d5d94a5ae7dcde01422f5e005605f016e262df..0f9574fe29b4f857b542c97c8ce2392fe11b6890 100644 (file)
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -469,7 +469,7 @@ SIGINT, SIGTERM, etc. -- signal numbers\n\
 A signal handler function is called with two arguments:\n\
 the first is the signal number, the second is the interrupted stack frame.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initsignal(void)
 {
        PyObject *m, *d, *x;

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 8024006c66f6fee1d47da19c96f9329001dac38e..b9358b75108f61ef6e07820fda5e04271a7068d2 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3008,7 +3008,7 @@ PyDoc_STRVAR(socket_doc,
 "Implementation module for socket operations.  See the socket module\n\
 for documentation.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_socket(void)
 {
        PyObject *m;

diff --git a/Modules/stropmodule.c b/Modules/stropmodule.c
index 09bcc3d305aebbbce09c7770f26ebfc2af106ae2..8eb64a070ae91db175055bbd28c60f12189c38ed 100644 (file)
--- a/Modules/stropmodule.c
+++ b/Modules/stropmodule.c
@@ -1203,7 +1203,7 @@ strop_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initstrop(void)
 {
        PyObject *m, *s;

diff --git a/Modules/structmodule.c b/Modules/structmodule.c
index 5d4de116d8a92e67f734c9a4e825f2f61cd4be74..093cd7b9e1be12580ea507e87f55a06da8330b1f 100644 (file)
--- a/Modules/structmodule.c
+++ b/Modules/structmodule.c
@@ -1499,7 +1499,7 @@ static PyMethodDef struct_methods[] = {
 
 /* Module initialization */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initstruct(void)
 {
        PyObject *m;

diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c
index e24e72fb10f5a91dbebbe67dcae7511000698a57..9854a1cf6c5148eff62f169e16608b3ff474029a 100644 (file)
--- a/Modules/symtablemodule.c
+++ b/Modules/symtablemodule.c
@@ -43,7 +43,7 @@ static PyMethodDef symtable_methods[] = {
        {NULL,          NULL}           /* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_symtable(void)
 {
        PyObject *m;

diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index 2d886e1e5b80d00431bf3d48c644f2afa0fa9cfc..75deb1b8d7c7214f218c4684da2c97d19586bf98 100644 (file)
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -155,7 +155,7 @@ static PyMethodDef syslog_methods[] = {
 
 /* Initialization function for the module */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initsyslog(void)
 {
        PyObject *m;

diff --git a/Modules/termios.c b/Modules/termios.c
index ed78ece933a84c9cc8c8c6b8f6ef82ae2f03bab9..3ace25c4e1bffbe327879dc2d731f8f2f5047654 100644 (file)
--- a/Modules/termios.c
+++ b/Modules/termios.c
@@ -892,7 +892,7 @@ static struct constant {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 PyInit_termios(void)
 {
        PyObject *m;

diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index b872dd02138e6056549d24521972f073343a3e6a..896d4faa60a8bebe1c51a4798a5464c285a92f32 100644 (file)
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -360,7 +360,7 @@ A lock is not owned by the thread that locked it; another thread may\n\
 unlock it.  A thread attempting to lock a lock that it has already locked\n\
 will block until another thread unlocks it.  Deadlocks may ensue.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initthread(void)
 {
        PyObject *m, *d;

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index eb48c2bd10870c76405f6e686bafcdf03a4e121a..13da2ffe24ef4a531ac3416cac64cbac810459ef 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -620,7 +620,7 @@ strftime() -- convert time tuple to string according to format specification\n\
 strptime() -- parse string to time tuple according to format specification");
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 inittime(void)
 {
        PyObject *m;

diff --git a/Modules/timingmodule.c b/Modules/timingmodule.c
index 4e10e31349040baa04881be63996c3cd13e254d4..56e057a656a3aa2796a1ae03b72f733910b1aa11 100644 (file)
--- a/Modules/timingmodule.c
+++ b/Modules/timingmodule.c
@@ -52,7 +52,7 @@ static PyMethodDef timing_methods[] = {
 };
 
 
-DL_EXPORT(void) inittiming(void)
+PyMODINIT_FUNC inittiming(void)
 {
        (void)Py_InitModule("timing", timing_methods);
 }

diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c
index 8c6b91f201d310cd57658c330a06b263412855c0..3009768192d3aa1413c548ac02acef21fcce85ad 100644 (file)
--- a/Modules/xreadlinesmodule.c
+++ b/Modules/xreadlinesmodule.c
@@ -168,7 +168,7 @@ static PyMethodDef xreadlines_functions[] = {
        {NULL, NULL}
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initxreadlines(void)
 {
        XReadlinesObject_Type.ob_type = &PyType_Type;

diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c
index 2264dfb5c0e3184a07ddfa436c839fe37b4d59a0..125d2ece1ab7d14ab6aa1422cce56b46324371f0 100644 (file)
--- a/Modules/xxmodule.c
+++ b/Modules/xxmodule.c
@@ -218,7 +218,7 @@ static PyMethodDef xx_methods[] = {
 
 /* Initialization function for the module (*must* be called initxx) */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initxx(void)
 {
        PyObject *m;

diff --git a/Modules/xxsubtype.c b/Modules/xxsubtype.c
index 90134678d3f42e567291fc0de478730678d0ad61..c826b6e633c36f95401d5bdb4865f43bf3be4eec 100644 (file)
--- a/Modules/xxsubtype.c
+++ b/Modules/xxsubtype.c
@@ -263,7 +263,7 @@ static PyMethodDef xxsubtype_functions[] = {
        {NULL,          NULL}           /* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initxxsubtype(void)
 {
        PyObject *m;

diff --git a/PC/WinMain.c b/PC/WinMain.c
index 7ee1ad69f3e1fcbcac97839f78ff47cf2c8c636c..00dc18d484b9962263a1a750304f7d47f716876f 100644 (file)
--- a/PC/WinMain.c
+++ b/PC/WinMain.c
@@ -5,8 +5,6 @@
 
 #include "Python.h"
 
-extern int Py_Main(int, char **);
-
 int WINAPI WinMain(
     HINSTANCE hInstance,      /* handle to current instance */
     HINSTANCE hPrevInstance,  /* handle to previous instance */