[Numpy-svn] r3916 - in trunk/numpy/core: . src

numpy-svn@scip... numpy-svn@scip...
Sat Jul 28 05:24:36 CDT 2007


Author: pearu
Date: 2007-07-28 05:24:20 -0500 (Sat, 28 Jul 2007)
New Revision: 3916

Modified:
   trunk/numpy/core/setup.py
   trunk/numpy/core/src/umathmodule.c.src
Log:
Trying to fix inconsisted dll linkage warning, 4.

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2007-07-28 10:19:01 UTC (rev 3915)
+++ trunk/numpy/core/setup.py	2007-07-28 10:24:20 UTC (rev 3916)
@@ -105,6 +105,9 @@
             if sys.platform == 'win32':
                 moredefs.append('NPY_NO_SIGNAL')
 
+            if os.environ.get('DISTUTILS_USE_SDK'):
+                moredefs.append('DISTUTILS_USE_SDK')
+
             if sys.version[:3] < '2.4':
                 if config_cmd.check_func('strtod', decl=False,
                                          headers=['stdlib.h']):

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2007-07-28 10:19:01 UTC (rev 3915)
+++ trunk/numpy/core/src/umathmodule.c.src	2007-07-28 10:24:20 UTC (rev 3916)
@@ -66,7 +66,7 @@
 #undef sqrtf
 #endif
 float log1pf(float);
-#if defined(_WIN64)
+#if defined(DISTUTILS_USE_SDK)
 float __cdecl logf(float);
 float __cdecl sqrtf(float);
 #else



More information about the Numpy-svn mailing list