diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-07-21 09:49:34 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-07-21 09:49:34 +0000 |
| commit | 3ab762705a35ad7ba9a726a4a80abeb741e4f8a3 (patch) | |
| tree | f5d30692128f6196e497dbc0cf6859e46dd792ca | |
| parent | dbbf1bffae472d3e3c574a45546f892c6ef30b98 (diff) | |
| download | numpy-3ab762705a35ad7ba9a726a4a80abeb741e4f8a3.tar.gz | |
Look for already declared configure checks macros in python 2.5.
Python 2.5 already declared HAVE_HYPOT and other similar math funcs, so
look for those declaration to avoid redeclaring those macros ourselves.
Should fix some build warnings.
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 8e8bc82a5..c2161f0ba 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -142,7 +142,7 @@ def check_math_capabilities(config, moredefs, mathlibs): # config.h in the public namespace, so we have a clash for the common # functions we test. We remove every function tested by python's # autoconf, hoping their own test are correct - if sys.version_info[:2] >= (2, 6): + if sys.version_info[:2] >= (2, 5): for f in OPTIONAL_STDFUNCS_MAYBE: if config.check_decl(fname2def(f), headers=["Python.h", "math.h"]): diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index 337436c8a..f560d09aa 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -90,7 +90,7 @@ OPTIONAL_STDFUNCS = ["expm1", "log1p", "acosh", "asinh", "atanh", "rint", "trunc", "exp2", "log2", "copysign", "hypot", "atan2", "pow"] # Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h -OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh"] +OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh", "hypot"] # C99 functions: float and long double versions C99_FUNCS = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs", "floor", |