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

[numpy-svn at scipy.org]

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

Modified:
   trunk/numpy/core/setup.py
Log:
SIZEOF_LONGDOUBLE and SIZEOF_LONGLONG are public, since they are defined in noprefix.h. So don't define those in config.h.

Modified: trunk/numpy/core/setup.py
===================================================================
--- trunk/numpy/core/setup.py	2009-02-26 12:38:10 UTC (rev 6489)
+++ trunk/numpy/core/setup.py	2009-02-26 12:38:23 UTC (rev 6490)
@@ -153,7 +153,8 @@
     for type in ('short', 'int', 'long', 'float', 'double', 'long double'):
         res = config_cmd.check_type_size(type)
         if res >= 0:
-            private_defines.append(('SIZEOF_%s' % sym2def(type), '%d' % res))
+            if not type == 'long double':
+                private_defines.append(('SIZEOF_%s' % sym2def(type), '%d' % res))
             public_defines.append(('NPY_SIZEOF_%s' % sym2def(type), '%d' % res))
         else:
             raise SystemError("Checking sizeof (%s) failed !" % type)
@@ -179,7 +180,7 @@
 
         res = config_cmd.check_type_size('long long')
         if res >= 0:
-            private_defines.append(('SIZEOF_%s' % sym2def('long long'), '%d' % res))
+            #private_defines.append(('SIZEOF_%s' % sym2def('long long'), '%d' % res))
             public_defines.append(('NPY_SIZEOF_%s' % sym2def('long long'), '%d' % res))
         else:
             raise SystemError("Checking sizeof (%s) failed !" % 'long long')