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.

9 files changed, 10 insertions, 10 deletions

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 9f8a09e30b..2054c805ac 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -376,7 +376,7 @@ static PyMethodDef TestMethods[] = {
 	{NULL, NULL} /* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_testcapi(void)
 {
 	PyObject *m;
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 6c75a5d1dd..650f13c76e 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -2109,7 +2109,7 @@ ins_string(PyObject *d, char *name, char *val)
 }
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_tkinter(void)
 {
 	PyObject *m, *d;
diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c
index afb239039e..918a0fc258 100644
--- a/Modules/bsddbmodule.c
+++ b/Modules/bsddbmodule.c
@@ -841,7 +841,7 @@ static PyMethodDef bsddbmodule_methods[] = {
 	{0,		0},
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initbsddb(void) {
 	PyObject *m, *d;
 
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index eca67d349f..2bb6edc808 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1051,7 +1051,7 @@ static struct PyMethodDef mmap_functions[] = {
 	{NULL,		NULL}	     /* Sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 	initmmap(void)
 {
 	PyObject *dict, *module;
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index e790352c9f..c48c36851c 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -2852,9 +2852,9 @@ static PyMethodDef parser_functions[] =  {
     };
 
 
-DL_EXPORT(void) initparser(void);  /* supply a prototype */
+PyMODINIT_FUNC initparser(void);  /* supply a prototype */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initparser(void)
 {
     PyObject *module, *copyreg;
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 8fdc97d1d7..4149dc5251 100644
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -635,7 +635,7 @@ PyDoc_STRVAR(module_doc,
 *** IMPORTANT NOTICE ***\n\
 On Windows, only sockets are supported; on Unix, all file descriptors.");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initselect(void)
 {
 	PyObject *m;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d5c925b79f..dee042b206 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -530,7 +530,7 @@ internal_select(PySocketSockObject *s, int writing)
 
 static double defaulttimeout = -1.0; /* Default timeout for new sockets */
 
-static void
+PyMODINIT_FUNC
 init_sockobject(PySocketSockObject *s,
 		SOCKET_T fd, int family, int type, int proto)
 {
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
index 966c8ba4f1..83d21e2adc 100644
--- a/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@ -460,7 +460,7 @@ static PyMethodDef unicodedata_functions[] = {
 
 PyDoc_STRVAR(unicodedata_docstring, "unicode character database");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initunicodedata(void)
 {
     PyObject *m, *v;
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index c0dbff6c50..4c1ce23e21 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -834,7 +834,7 @@ PyDoc_STRVAR(zlib_module_documentation,
 "Compressor objects support compress() and flush() methods; decompressor\n"
 "objects support decompress() and flush().");
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 PyInit_zlib(void)
 {
     PyObject *m, *ver;