Make ext module typespecs to use PyMODINIT_FUNC that is essential for…

… mingw32 and c++ code combination to work correctly.
scipy · Apr 24, 2006 · c553166 · c553166
1 parent 926f18d
commit c553166
Show file tree

Hide file tree

Showing 31 changed files with 49 additions and 37 deletions.
diff --git a/Lib/integrate/_odepackmodule.c b/Lib/integrate/_odepackmodule.c
@@ -8,7 +8,7 @@ static struct PyMethodDef odepack_module_methods[] = {
 {"odeint", (PyCFunction) odepack_odeint, METH_VARARGS|METH_KEYWORDS, doc_odeint},
 {NULL,		NULL, 0, NULL}
 };
-DL_EXPORT(void) init_odepack() {
+PyMODINIT_FUNC init_odepack(void) {
   PyObject *m, *d, *s;
   m = Py_InitModule("_odepack", odepack_module_methods);
   import_array();

diff --git a/Lib/integrate/_quadpackmodule.c b/Lib/integrate/_quadpackmodule.c
@@ -14,7 +14,7 @@ static struct PyMethodDef quadpack_module_methods[] = {
 {"_qawce", quadpack_qawce, METH_VARARGS, doc_qawce},
 {NULL,		NULL, 0, NULL}
 };
-DL_EXPORT(void) init_quadpack() {
+PyMODINIT_FUNC init_quadpack(void) {
   PyObject *m, *d, *s;
   m = Py_InitModule("_quadpack", quadpack_module_methods);
   import_array();

diff --git a/Lib/interpolate/_fitpackmodule.c b/Lib/interpolate/_fitpackmodule.c
@@ -16,7 +16,7 @@ static struct PyMethodDef fitpack_module_methods[] = {
 {"_bispev", fitpack_bispev, METH_VARARGS, doc_bispev},
 {NULL,		NULL, 0, NULL}
 };
-DL_EXPORT(void) init_fitpack(void) {
+PyMODINIT_FUNC init_fitpack(void) {
   PyObject *m, *d, *s;
   m = Py_InitModule("_fitpack", fitpack_module_methods);
   import_array();

diff --git a/Lib/io/numpyiomodule.c b/Lib/io/numpyiomodule.c
@@ -842,7 +842,7 @@ static struct PyMethodDef numpyio_methods[] = {
   {NULL,         NULL}
 };
 
-DL_EXPORT(void) initnumpyio(void)
+PyMODINIT_FUNC initnumpyio(void)
 {
   PyObject *m, *d;
 

diff --git a/Lib/lib/blas/atlas_version.c b/Lib/lib/blas/atlas_version.c
@@ -3,7 +3,7 @@ extern "C" {
 #endif
 #include "Python.h"
 static PyMethodDef module_methods[] = { {NULL,NULL} };
-DL_EXPORT(void) initatlas_version(void) {
+PyMODINIT_FUNC initatlas_version(void) {
   PyObject *m = NULL;
 #if defined(NO_ATLAS_INFO)
   printf("NO ATLAS INFO AVAILABLE\n");

diff --git a/Lib/lib/lapack/atlas_version.c b/Lib/lib/lapack/atlas_version.c
@@ -3,7 +3,7 @@ extern "C" {
 #endif
 #include "Python.h"
 static PyMethodDef module_methods[] = { {NULL,NULL} };
-DL_EXPORT(void) initatlas_version(void) {
+PyMODINIT_FUNC initatlas_version(void) {
   PyObject *m = NULL;
 #if defined(NO_ATLAS_INFO)
   printf("NO ATLAS INFO AVAILABLE\n");

diff --git a/Lib/linalg/atlas_version.c b/Lib/linalg/atlas_version.c
@@ -3,7 +3,7 @@ extern "C" {
 #endif
 #include "Python.h"
 static PyMethodDef module_methods[] = { {NULL,NULL} };
-DL_EXPORT(void) initatlas_version(void) {
+PyMODINIT_FUNC initatlas_version(void) {
   PyObject *m = NULL;
 #if defined(NO_ATLAS_INFO)
   printf("NO ATLAS INFO AVAILABLE\n");

diff --git a/Lib/linsolve/_csuperlumodule.c b/Lib/linsolve/_csuperlumodule.c
@@ -190,7 +190,7 @@ static PyMethodDef cSuperLU_Methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_csuperlu(void)
 {
   Py_InitModule("_csuperlu", cSuperLU_Methods);

diff --git a/Lib/linsolve/_dsuperlumodule.c b/Lib/linsolve/_dsuperlumodule.c
@@ -231,7 +231,7 @@ static PyMethodDef dSuperLU_Methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_dsuperlu(void)
 {
   PyObject *m, *d;

diff --git a/Lib/linsolve/_ssuperlumodule.c b/Lib/linsolve/_ssuperlumodule.c
@@ -189,7 +189,7 @@ static PyMethodDef sSuperLU_Methods[] = {
   {NULL, NULL}
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_ssuperlu(void)
 {
   Py_InitModule("_ssuperlu", sSuperLU_Methods);

diff --git a/Lib/linsolve/_zsuperlumodule.c b/Lib/linsolve/_zsuperlumodule.c
@@ -193,7 +193,7 @@ static PyMethodDef zSuperLU_Methods[] = {
 
 
 /* This should be imported first */
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_zsuperlu(void)
 {
 

diff --git a/Lib/ndimage/src/nd_image.c b/Lib/ndimage/src/nd_image.c
@@ -1308,7 +1308,7 @@ static PyMethodDef methods[] = {
   {NULL, NULL, 0, NULL}
 };
 
-DL_EXPORT(void) init_nd_image(void)
+PyMODINIT_FUNC init_nd_image(void)
 {
   Py_InitModule("_nd_image", methods);
   import_libnumarray();

diff --git a/Lib/optimize/_minpackmodule.c b/Lib/optimize/_minpackmodule.c
@@ -13,7 +13,7 @@ static struct PyMethodDef minpack_module_methods[] = {
 {"_chkder", minpack_chkder, METH_VARARGS, doc_chkder},
 {NULL,		NULL, 0, NULL}
 };
-DL_EXPORT(void) init_minpack(void) {
+PyMODINIT_FUNC init_minpack(void) {
   PyObject *m, *d, *s;
   m = Py_InitModule("_minpack", minpack_module_methods);
   import_array();

diff --git a/Lib/optimize/tnc/moduleTNC.c b/Lib/optimize/tnc/moduleTNC.c
@@ -297,7 +297,7 @@ static PyMethodDef moduleTNC_methods[] =
   {NULL, NULL}
 };
 
-DL_EXPORT(void) initmoduleTNC(void)
+PyMODINIT_FUNC initmoduleTNC(void)
 {
   (void) Py_InitModule("moduleTNC", moduleTNC_methods);
 }
diff --git a/Lib/optimize/zeros.c b/Lib/optimize/zeros.c
@@ -159,7 +159,7 @@ Zerosmethods[] = {
 	{NULL, NULL}
 };
 
-DL_EXPORT(void) init_zeros(void)
+PyMODINIT_FUNC init_zeros(void)
 {
         double tol;
 

diff --git a/Lib/sandbox/delaunay/_delaunay.cpp b/Lib/sandbox/delaunay/_delaunay.cpp
@@ -665,7 +665,7 @@ static PyMethodDef delaunay_methods[] = {
 };
 
 
-DL_EXPORT(void) init_delaunay()
+PyMODINIT_FUNC init_delaunay(void)
 {
     PyObject* m;
     m = Py_InitModule3("_delaunay", delaunay_methods, 

diff --git a/Lib/sandbox/netcdf/_netcdf.c b/Lib/sandbox/netcdf/_netcdf.c
@@ -2064,7 +2064,7 @@ static PyMethodDef netcdf_methods[] = {
 
 /* Module initialization */
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 init_netcdf(void)
 {
   PyObject *m, *d;

diff --git a/Lib/sandbox/netcdf/demomodule.c b/Lib/sandbox/netcdf/demomodule.c
@@ -71,7 +71,7 @@ static PyMethodDef demo_methods[] = {
 
 /* Module initialization */
 
-DL_EXPORT(void) initdemo(void)
+PyMODINIT_FUNC initdemo(void)
 {
   PyObject *module;
   PyObject *netcdf, *netcdf_dict;

diff --git a/Lib/sandbox/odr/__odrpack.c b/Lib/sandbox/odr/__odrpack.c
@@ -1345,7 +1345,7 @@ static PyMethodDef methods[] = {
   {NULL, NULL},
 };
 
-DL_EXPORT(void) init__odrpack(void)
+PyMODINIT_FUNC init__odrpack(void)
 {
   PyObject *m, *d;
 

diff --git a/Lib/sandbox/pysparse/src/itsolversmodule.c b/Lib/sandbox/pysparse/src/itsolversmodule.c
@@ -637,7 +637,7 @@ The result is tuple with 3 elements:\n\
 \n\
 ";
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 inititsolvers(void)
 {
   PyObject *m;

diff --git a/Lib/sandbox/pysparse/src/jdsymmodule.c b/Lib/sandbox/pysparse/src/jdsymmodule.c
@@ -318,7 +318,7 @@ static PyMethodDef jdsym_methods[] = {
 static char module_doc[] = "This module ...\n\
 ";
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initjdsym(void) {
   PyObject *m;
 

diff --git a/Lib/sandbox/pysparse/src/preconmodule.c b/Lib/sandbox/pysparse/src/preconmodule.c
@@ -520,7 +520,7 @@ static PyMethodDef precon_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initprecon(void)
 {
   PyObject *m, *d;

diff --git a/Lib/sandbox/pysparse/src/spmatrixmodule.c b/Lib/sandbox/pysparse/src/spmatrixmodule.c
@@ -347,7 +347,7 @@ static PyMethodDef spmatrix_methods[] = {
   {NULL, NULL}	/* sentinel */
 };
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initspmatrix(void)
 {
   PyObject *m, *d;

diff --git a/Lib/sandbox/pysparse/src/superlumodule.c b/Lib/sandbox/pysparse/src/superlumodule.c
@@ -339,7 +339,7 @@ static PyMethodDef precon_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initsuperlu(void)
 {
   PyObject *m, *d;

diff --git a/Lib/sandbox/pysparse/src/umfpackmodule.c b/Lib/sandbox/pysparse/src/umfpackmodule.c
@@ -583,7 +583,7 @@ static PyMethodDef precon_methods[] = {
 };
 
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initumfpack(void)
 {
   PyObject *m, *d;

diff --git a/Lib/sandbox/xplt/pygist/gistCmodule.c b/Lib/sandbox/xplt/pygist/gistCmodule.c
@@ -9349,7 +9349,7 @@ static struct PyMethodDef gist_methods[] =
 /* Initialize the module.  This should be the only symbol with
    external linkage. */
 
-DL_EXPORT(void) initgistC (void)
+PyMODINIT_FUNC initgistC (void)
 {
   PyObject *m, *d, *sys_path;
   int i, n;

diff --git a/Lib/sandbox/xplt/pygist/gistfuncsmodule.c b/Lib/sandbox/xplt/pygist/gistfuncsmodule.c
@@ -1415,7 +1415,7 @@ static char arrayfns_module_documentation[] =
 ""
 ;
 
-DL_EXPORT(void)
+PyMODINIT_FUNC
 initgistfuncs(void)
 {
     PyObject *m, *d;

diff --git a/Lib/signal/sigtoolsmodule.c b/Lib/signal/sigtoolsmodule.c
@@ -2178,7 +2178,7 @@ static struct PyMethodDef toolbox_module_methods[] = {
 
 /* Initialization function for the module (*must* be called initsigtools) */
 
-DL_EXPORT(void) initsigtools(void) {
+PyMODINIT_FUNC initsigtools(void) {
         PyObject *m, *d;
 
 	/* Create the module and add the functions */

diff --git a/Lib/signal/splinemodule.c b/Lib/signal/splinemodule.c
@@ -470,7 +470,7 @@ static struct PyMethodDef toolbox_module_methods[] = {
 
 /* Initialization function for the module (*must* be called initXXXXX) */
 
-DL_EXPORT(void) initspline(void) {
+PyMODINIT_FUNC initspline(void) {
     PyObject *m, *d, *s;
 
     /* Create the module and add the functions */

diff --git a/Lib/special/_cephesmodule.c b/Lib/special/_cephesmodule.c
@@ -1075,7 +1075,7 @@ static struct PyMethodDef methods[] = {
 };
 
 
-DL_EXPORT(void) init_cephes(void) {
+PyMODINIT_FUNC init_cephes(void) {
   PyObject *m, *d, *s;
 
   /* Create the module and add the functions */

diff --git a/Lib/weave/ext_tools.py b/Lib/weave/ext_tools.py
@@ -191,12 +191,24 @@ def __init__(self,name,compiler=''):
     def add_function(self,func):
         self.functions.append(func)
     def module_code(self):
-        code = '\n'.join([self.warning_code(),
-               self.header_code(),
-               self.support_code(),
-               self.function_code(),
-               self.python_function_definition_code(),
-               self.module_init_code()])
+        code = '\n'.join([
+            """\
+#ifdef __CPLUSPLUS__
+extern "C" {
+#endif
+""",
+            self.warning_code(),
+            self.header_code(),
+            self.support_code(),
+            self.function_code(),
+            self.python_function_definition_code(),
+            self.module_init_code(),
+            """\
+#ifdef __CPLUSCPLUS__
+}
+#endif
+"""
+            ])
         return code
 
     def arg_specs(self):
@@ -272,7 +284,7 @@ def python_function_definition_code(self):
     def module_init_code(self):
         init_code_list =  self.build_information().module_init_code()
         init_code = indent(''.join(init_code_list),4)
-        code = 'DL_EXPORT(void) init%s(void)\n' \
+        code = 'PyMODINIT_FUNC init%s(void)\n' \
                '{\n' \
                '%s' \
                '    (void) Py_InitModule("%s", compiled_methods);\n' \