[Scipy-svn] r3016 - in trunk/Lib/stsci: convolve/src image/src

[scipy-svn@scip...]

Author: pearu
Date: 2007-05-18 09:16:27 -0500 (Fri, 18 May 2007)
New Revision: 3016

Modified:
   trunk/Lib/stsci/convolve/src/_correlatemodule.c
   trunk/Lib/stsci/convolve/src/_lineshapemodule.c
   trunk/Lib/stsci/image/src/_combinemodule.c
Log:
Fixed few compiler warnings.

Modified: trunk/Lib/stsci/convolve/src/_correlatemodule.c
===================================================================
--- trunk/Lib/stsci/convolve/src/_correlatemodule.c	2007-05-17 15:35:58 UTC (rev 3015)
+++ trunk/Lib/stsci/convolve/src/_correlatemodule.c	2007-05-18 14:16:27 UTC (rev 3016)
@@ -5,6 +5,7 @@
 #include <signal.h>
 #include <ctype.h>
 
+#define NO_IMPORT_ARRAY
 #include "numpy/libnumarray.h"
 
 typedef enum
@@ -666,12 +667,7 @@
     {NULL, NULL} /* Sentinel */
 };
 
-/* platform independent*/
-#ifdef MS_WIN32
-__declspec(dllexport)
-#endif
-
-void init_correlate(void)
+PyMODINIT_FUNC init_correlate(void)
 {
 	PyObject *m, *d;
 	m = Py_InitModule("_correlate", _correlateMethods);

Modified: trunk/Lib/stsci/convolve/src/_lineshapemodule.c
===================================================================
--- trunk/Lib/stsci/convolve/src/_lineshapemodule.c	2007-05-17 15:35:58 UTC (rev 3015)
+++ trunk/Lib/stsci/convolve/src/_lineshapemodule.c	2007-05-18 14:16:27 UTC (rev 3016)
@@ -29,6 +29,7 @@
 
 #include <math.h>
 
+#define NO_IMPORT_ARRAY
 #include "numpy/libnumarray.h"
 
 
@@ -360,7 +361,7 @@
 
 /*** module initialization ***/
 
-DL_EXPORT(void) init_lineshape(void)
+PyMODINIT_FUNC init_lineshape(void)
 {
     PyObject *m, *d;
     m = Py_InitModule("_lineshape", _lineshape_Methods);

Modified: trunk/Lib/stsci/image/src/_combinemodule.c
===================================================================
--- trunk/Lib/stsci/image/src/_combinemodule.c	2007-05-17 15:35:58 UTC (rev 3015)
+++ trunk/Lib/stsci/image/src/_combinemodule.c	2007-05-18 14:16:27 UTC (rev 3016)
@@ -5,6 +5,7 @@
 #include <signal.h>
 #include <ctype.h>
 
+#define NO_IMPORT_ARRAY
 #include "numpy/libnumarray.h"
 
 #define MAX_ARRAYS 1024
@@ -224,12 +225,7 @@
     {NULL, NULL} /* Sentinel */
 };
 
-/* platform independent*/
-#ifdef MS_WIN32
-__declspec(dllexport)
-#endif
-
-void init_combine(void)
+PyMODINIT_FUNC init_combine(void)
 {
 	PyObject *m, *d;
 	m = Py_InitModule("_combine", _combineMethods);