Make ext module typespecs to use PyMODINIT_FUNC that is essential for mingw32 and c++ code combination to work correctly.

11 files changed, 13 insertions, 14 deletions

diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c
index c9841a1fb..e48478a7f 100644
--- a/numpy/core/blasdot/_dotblas.c
+++ b/numpy/core/blasdot/_dotblas.c
@@ -1019,7 +1019,7 @@ static struct PyMethodDef dotblas_module_methods[] = {
 };
 
 /* Initialization function for the module */
-DL_EXPORT(void) init_dotblas(void) {
+PyMODINIT_FUNC init_dotblas(void) {
     int i;
     PyObject *m, *d, *s;
     
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c
index 2bd605889..5b8b06356 100644
--- a/numpy/core/src/multiarraymodule.c
+++ b/numpy/core/src/multiarraymodule.c
@@ -6009,7 +6009,7 @@ set_flaginfo(PyObject *d)
 
 /* Initialization function for the module */
 
-DL_EXPORT(void) initmultiarray(void) {
+PyMODINIT_FUNC initmultiarray(void) {
 	PyObject *m, *d, *s;
 	PyObject *c_api;
 
diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src
index aa74830e3..6b7fb2f1b 100644
--- a/numpy/core/src/scalarmathmodule.c.src
+++ b/numpy/core/src/scalarmathmodule.c.src
@@ -266,7 +266,7 @@ static struct PyMethodDef methods[] = {
 	{NULL, NULL, 0}
 };
 
-DL_EXPORT(void) initscalarmath(void) {
+PyMODINIT_FUNC initscalarmath(void) {
 	PyObject *m;
 
 	m = Py_initModule("scalarmath", methods);
diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src
index 5b0f44c44..f15fc01ce 100644
--- a/numpy/core/src/umathmodule.c.src
+++ b/numpy/core/src/umathmodule.c.src
@@ -2269,7 +2269,7 @@ static struct PyMethodDef methods[] = {
 	{NULL,		NULL, 0}		/* sentinel */
 };
 
-DL_EXPORT(void) initumath(void) {
+PyMODINIT_FUNC initumath(void) {
 	PyObject *m, *d, *s, *s2, *c_api;
 	double pinf, pzero, mynan;
         int UFUNC_FLOATING_POINT_SUPPORT = 1;
diff --git a/numpy/dft/fftpack_litemodule.c b/numpy/dft/fftpack_litemodule.c
index 4fdfa1043..f6d9aaf6b 100644
--- a/numpy/dft/fftpack_litemodule.c
+++ b/numpy/dft/fftpack_litemodule.c
@@ -240,8 +240,7 @@ static char fftpack_module_documentation[] =
 ""
 ;
 
-DL_EXPORT(void)
-initfftpack_lite(void)
+PyMODINIT_FUNC initfftpack_lite(void)
 {
 	PyObject *m, *d;
 
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
index a0f481754..617d1d2ca 100644
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -1063,7 +1063,7 @@ extern "C" {
 #endif
 #include "Python.h"
 static PyMethodDef module_methods[] = { {NULL,NULL} };
-DL_EXPORT(void) initatlas_version(void) {
+PyMODINIT_FUNC initatlas_version(void) {
   void ATL_buildinfo(void);
   ATL_buildinfo();
   Py_InitModule("atlas_version", module_methods);
diff --git a/numpy/doc/pyrex/numpyx.c b/numpy/doc/pyrex/numpyx.c
index 0e2658242..45e22594e 100644
--- a/numpy/doc/pyrex/numpyx.c
+++ b/numpy/doc/pyrex/numpyx.c
@@ -778,8 +778,8 @@ static struct PyMethodDef __pyx_methods[] = {
   {0, 0, 0, 0}
 };
 
-DL_EXPORT(void) initnumpyx(void); /*proto*/
-DL_EXPORT(void) initnumpyx(void) {
+PyMODINIT_FUNC initnumpyx(void); /*proto*/
+PyMODINIT_FUNC initnumpyx(void) {
   PyObject *__pyx_1 = 0;
   __pyx_m = Py_InitModule4("numpyx", __pyx_methods, 0, 0, PYTHON_API_VERSION);
   if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; goto __pyx_L1;};
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index b8581f7a7..e322226c2 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -167,7 +167,7 @@ static PyMethodDef f2py_module_methods[] = {
 \t{NULL,NULL}
 };
 
-DL_EXPORT(int) init#modulename#(void) {
+PyMODINIT_FUNC init#modulename#(void) {
 \tint i;
 \tPyObject *m,*d, *s;
 \tm = #modulename#_module = Py_InitModule(\"#modulename#\", f2py_module_methods);
diff --git a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
index 07d0135cc..58d7e6da4 100644
--- a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
+++ b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c
@@ -114,7 +114,7 @@ static PyMethodDef f2py_module_methods[] = {
   {NULL,NULL}
 };
 
-DL_EXPORT(void) initwrap(void) {
+PyMODINIT_FUNC initwrap(void) {
   PyObject *m,*d, *s;
   m = wrap_module = Py_InitModule("wrap", f2py_module_methods);
   PyFortran_Type.ob_type = &PyType_Type;
diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c
index 9af8fca0f..e5bfeae43 100644
--- a/numpy/lib/src/_compiled_base.c
+++ b/numpy/lib/src/_compiled_base.c
@@ -430,7 +430,7 @@ define_types(void)
 
 /* Initialization function for the module (*must* be called initArray) */
 
-DL_EXPORT(void) init_compiled_base(void) {
+PyMODINIT_FUNC init_compiled_base(void) {
     PyObject *m, *d, *s;
   
     /* Create the module and add the functions */
diff --git a/numpy/random/mtrand/mtrand.c b/numpy/random/mtrand/mtrand.c
index a8e6e5e75..a54628ea7 100644
--- a/numpy/random/mtrand/mtrand.c
+++ b/numpy/random/mtrand/mtrand.c
@@ -5113,8 +5113,8 @@ static struct PyMethodDef __pyx_methods[] = {
   {0, 0, 0, 0}
 };
 
-DL_EXPORT(void) initmtrand(void); /*proto*/
-DL_EXPORT(void) initmtrand(void) {
+PyMODINIT_FUNC initmtrand(void); /*proto*/
+PyMODINIT_FUNC initmtrand(void) {
   PyObject *__pyx_1 = 0;
   PyObject *__pyx_2 = 0;
   __pyx_m = Py_InitModule4("mtrand", __pyx_methods, 0, 0, PYTHON_API_VERSION);