[Numpy-svn] r4745 - in branches/build_with_scons/numpy/core: . include/numpy

numpy-svn@scip... numpy-svn@scip...
Wed Jan 23 06:16:53 CST 2008


Author: cdavid
Date: 2008-01-23 06:16:45 -0600 (Wed, 23 Jan 2008)
New Revision: 4745

Modified:
   branches/build_with_scons/numpy/core/SConstruct
   branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
Log:
Handle NO_SIGNAL for platforms which do not define it

Modified: branches/build_with_scons/numpy/core/SConstruct
===================================================================
--- branches/build_with_scons/numpy/core/SConstruct	2008-01-23 11:56:59 UTC (rev 4744)
+++ branches/build_with_scons/numpy/core/SConstruct	2008-01-23 12:16:45 UTC (rev 4745)
@@ -1,4 +1,4 @@
-# Last Change: Sun Jan 13 04:00 PM 2008 J
+# Last Change: Wed Jan 23 08:00 PM 2008 J
 # vim:syntax=python
 import os
 import sys
@@ -70,8 +70,10 @@
 # Checking signal stuff
 #----------------------
 if is_npy_no_signal():
-    numpyconfig_sym.append(('NPY_NO_SIGNAL', ''))
+    numpyconfig_sym.append(('DEFINE_NPY_NO_SIGNAL', '#define NPY_NO_SIGNAL\n'))
     config.Define('__NPY_PRIVATE_NO_SIGNAL', comment = "define to 1 to disable SMP support ")
+else:
+    numpyconfig_sym.append(('DEFINE_NPY_NO_SIGNAL', ''))
 
 #---------------------
 # Checking SMP option

Modified: branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
===================================================================
--- branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-23 11:56:59 UTC (rev 4744)
+++ branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-23 12:16:45 UTC (rev 4745)
@@ -6,7 +6,7 @@
 #define NPY_SIZEOF_LONGDOUBLE   @SIZEOF_LONG_DOUBLE@
 #define NPY_SIZEOF_PY_INTPTR_T  @SIZEOF_PY_INTPTR_T@
 
-#define NPY_NO_SIGNAL    @NPY_NO_SIGNAL@
+@DEFINE_NPY_NO_SIGNAL@
 #define NPY_NO_SMP       @NPY_NO_SMP@
 
 /* XXX: this has really nothing to do in a config file... */



More information about the Numpy-svn mailing list