diff options
| author | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-05-09 14:16:16 +0200 |
|---|---|---|
| committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2013-05-09 14:16:16 +0200 |
| commit | 509bc25b4f71f9ffaf259b08b259d0e8aef2129a (patch) | |
| tree | 02375a37b97f7a8db2639ae67fd2bfedcb345b65 /numpy | |
| parent | b114d1e0326937e5d04907ea0f666429580dc806 (diff) | |
| download | numpy-509bc25b4f71f9ffaf259b08b259d0e8aef2129a.tar.gz | |
MAINT: mask npy_config.h include with HAVE_NPY_CONFIG_H
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/include/numpy/npy_math.h | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/numpy/core/include/numpy/npy_math.h b/numpy/core/include/numpy/npy_math.h index a82541ed3..1d8dcf5bf 100644 --- a/numpy/core/include/numpy/npy_math.h +++ b/numpy/core/include/numpy/npy_math.h @@ -6,7 +6,9 @@ extern "C" { #endif #include <math.h> +#ifdef NPY_HAVE_CONFIG_H #include <npy_config.h> +#endif #include <numpy/npy_common.h> /* diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 58d6072e8..bffd50d72 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -606,6 +606,8 @@ def configuration(parent_package='',top_path=None): config.add_include_dirs(join('src', 'umath')) config.add_include_dirs(join('src', 'npysort')) + config.add_define_macros([("HAVE_NPY_CONFIG_H", "1")]) + config.numpy_include_dirs.extend(config.paths('include')) deps = [join('src','npymath','_signbit.c'), |