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

numpy-svn@scip... numpy-svn@scip...
Sat Jul 28 05:33:49 CDT 2007


Author: pearu
Date: 2007-07-28 05:33:44 -0500 (Sat, 28 Jul 2007)
New Revision: 3918

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

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2007-07-28 10:28:44 UTC (rev 3917)
+++ trunk/numpy/core/setup.py	2007-07-28 10:33:44 UTC (rev 3918)
@@ -107,7 +107,9 @@
 
             if sys.platform=='win32' or os.name=='nt':
                 from distutils.msvccompiler import get_build_architecture
-                if get_build_architecture() == 'AMD64':
+                a = get_build_architecture()
+                print 'BUILD_ARCHITECTURE: %r, os.name=%r, sys.platform=%r' % (a, os.name, sys.platform)
+                if a == 'AMD64':
                     moredefs.append('DISTUTILS_USE_SDK')
 
             if sys.version[:3] < '2.4':

Modified: trunk/numpy/core/src/umathmodule.c.src
===================================================================
--- trunk/numpy/core/src/umathmodule.c.src	2007-07-28 10:28:44 UTC (rev 3917)
+++ trunk/numpy/core/src/umathmodule.c.src	2007-07-28 10:33:44 UTC (rev 3918)
@@ -66,7 +66,7 @@
 #undef sqrtf
 #endif
 float log1pf(float);
-#if defined(DISTUTILS_USE_SDK)
+#ifdef DISTUTILS_USE_SDK
 float __cdecl logf(float);
 float __cdecl sqrtf(float);
 #else



More information about the Numpy-svn mailing list