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

numpy-svn@scip... numpy-svn@scip...
Sun Jan 20 23:29:43 CST 2008


Author: cdavid
Date: 2008-01-20 23:29:36 -0600 (Sun, 20 Jan 2008)
New Revision: 4732

Modified:
   branches/build_with_scons/numpy/core/SConstruct
   branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
Log:
Fixes for config and numpyconfig header generation:
 - signal stuff test result was wrongly put in NPY_NOSMP variable in
   numpyconfig.h header: replaced by correct NPY_NO_SIGNAL
 - Replace NPY_NO_SIGNAL by a private __NPY_PRIVATE_NO_SIGNAL in config.h, to
   avoid clash between config.h and numpyconfig.h


Modified: branches/build_with_scons/numpy/core/SConstruct
===================================================================
--- branches/build_with_scons/numpy/core/SConstruct	2008-01-20 20:42:07 UTC (rev 4731)
+++ branches/build_with_scons/numpy/core/SConstruct	2008-01-21 05:29:36 UTC (rev 4732)
@@ -57,8 +57,8 @@
 # Checking signal stuff
 #----------------------
 if is_npy_no_signal():
-    numpyconfig_sym.append(('NPY_NOSMP', '1'))
-    config.Define('NPY_NOSMP', 1, "define to 1 to disable SMP support ")
+    numpyconfig_sym.append(('NPY_NO_SIGNAL', ''))
+    config.Define('__NPY_PRIVATE_NO_SIGNAL', comment = "define to 1 to disable SMP support ")
 
 #---------------------
 # 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-20 20:42:07 UTC (rev 4731)
+++ branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-21 05:29:36 UTC (rev 4732)
@@ -6,6 +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_NOSMP        @NPY_NOSMP@
 
 /* XXX: this has really nothing to do in a config file... */



More information about the Numpy-svn mailing list