[Numpy-svn] r6489 - trunk/numpy/core

[numpy-svn at scipy.org]

Author: cdavid
Date: 2009-02-26 06:38:10 -0600 (Thu, 26 Feb 2009)
New Revision: 6489

Modified:
   trunk/numpy/core/setup.py
Log:
BUG: fix sym2def. Some of our SIZEOF_ defines were not consistent with the ones actually used in the code (SIZEOF_LONG_DOUBLE vs SIZEOF_LONGDOUBLE).

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2009-02-26 12:37:57 UTC (rev 6488)
+++ trunk/numpy/core/setup.py	2009-02-26 12:38:10 UTC (rev 6489)
@@ -180,7 +180,7 @@
         res = config_cmd.check_type_size('long long')
         if res >= 0:
             private_defines.append(('SIZEOF_%s' % sym2def('long long'), '%d' % res))
-            public_defines.append(('NPY_SIZEOF_%s' % 'LONGLONG', '%d' % res))
+            public_defines.append(('NPY_SIZEOF_%s' % sym2def('long long'), '%d' % res))
         else:
             raise SystemError("Checking sizeof (%s) failed !" % 'long long')
 
@@ -192,7 +192,7 @@
     return private_defines, public_defines
 
 def sym2def(symbol):
-    define = symbol.replace(' ', '_')
+    define = symbol.replace(' ', '')
     return define.upper()
 
 def check_mathlib(config_cmd):