diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-06-03 10:36:43 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-06-03 10:36:43 -0700 |
| commit | 8ab4e1ac2ad80c11f1efc9fbfe0fa32d70e6a474 (patch) | |
| tree | 186335a4764cdc37ff4228156cc1c9573f1d86bc | |
| parent | dff8c9497b06542712e9666b43ac80b2a30f1d47 (diff) | |
| parent | 54c1471d25038a8e303e68ed71f0043c5786b28b (diff) | |
| download | numpy-8ab4e1ac2ad80c11f1efc9fbfe0fa32d70e6a474.tar.gz | |
Merge pull request #3394 from juliantaylor/incl-guard-fix
BUG: fix typo on npy_config.h include guard
| -rw-r--r-- | numpy/core/include/numpy/npy_math.h | 2 | ||||
| -rw-r--r-- | numpy/core/src/umath/loops.c.src | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/numpy/core/include/numpy/npy_math.h b/numpy/core/include/numpy/npy_math.h index 625999022..537a63ee4 100644 --- a/numpy/core/include/numpy/npy_math.h +++ b/numpy/core/include/numpy/npy_math.h @@ -6,7 +6,7 @@ extern "C" { #endif #include <math.h> -#ifdef NPY_HAVE_CONFIG_H +#ifdef HAVE_NPY_CONFIG_H #include <npy_config.h> #endif #include <numpy/npy_common.h> diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src index 5eae448ee..687c62987 100644 --- a/numpy/core/src/umath/loops.c.src +++ b/numpy/core/src/umath/loops.c.src @@ -5,7 +5,6 @@ #include "Python.h" -#include "npy_config.h" #ifdef ENABLE_SEPARATE_COMPILATION #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API #define NO_IMPORT_ARRAY |