diff options
author | David Cournapeau <cournape@gmail.com> | 2008-01-21 05:35:20 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2008-01-21 05:35:20 +0000 |
commit | 41ca4b191c3d0cbcd48f3f3cd5456c2982339a3a (patch) | |
tree | 1051324b3d83a8307996445c550669ac519a65f3 /numpy/core | |
parent | 7a18c98fcb9466893febf93f0555b18e69d4f8bf (diff) | |
download | numpy-41ca4b191c3d0cbcd48f3f3cd5456c2982339a3a.tar.gz |
Fixes for config and numpyconfig header generation:
- Replace NPY_NOSMP by NPY_NO_SMP in numpyconfig.h, and remove the NPY_NO_SMP
define in config.h, because it is not needed.
Diffstat (limited to 'numpy/core')
-rw-r--r-- | numpy/core/SConstruct | 8 | ||||
-rw-r--r-- | numpy/core/include/numpy/numpyconfig.h.in | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/numpy/core/SConstruct b/numpy/core/SConstruct index 1b9509eff..1be5bf6c9 100644 --- a/numpy/core/SConstruct +++ b/numpy/core/SConstruct @@ -63,9 +63,11 @@ if is_npy_no_signal(): #--------------------- # Checking SMP option #--------------------- -st = define_no_smp() -numpyconfig_sym.append(('NPY_NOSMP', st)) -config.Define('NPY_NOSMP', st, "define to 1 to disable SMP support ") +if define_no_smp(): + nosmp = 1 +else: + nosmp = 0 +numpyconfig_sym.append(('NPY_NO_SMP', nosmp)) #---------------------- # Checking the mathlib diff --git a/numpy/core/include/numpy/numpyconfig.h.in b/numpy/core/include/numpy/numpyconfig.h.in index 9eee46484..48c3a7b25 100644 --- a/numpy/core/include/numpy/numpyconfig.h.in +++ b/numpy/core/include/numpy/numpyconfig.h.in @@ -7,7 +7,7 @@ #define NPY_SIZEOF_PY_INTPTR_T @SIZEOF_PY_INTPTR_T@ #define NPY_NO_SIGNAL @NPY_NO_SIGNAL@ -#define NPY_NOSMP @NPY_NOSMP@ +#define NPY_NO_SMP @NPY_NO_SMP@ /* XXX: this has really nothing to do in a config file... */ #define NPY_MATHLIB @MATHLIB@ |