diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2009-08-25 08:00:39 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2009-08-25 08:00:39 +0000 |
| commit | 6f1ad4ceb7bc2576e4941cd6ecefc4051bce382e (patch) | |
| tree | f657437f565edc548f7f3664e9e35c488840a7b6 /numpy/core/setup_common.py | |
| parent | 7da80a7be11966369702d6076e2771686879ef37 (diff) | |
| download | numpy-6f1ad4ceb7bc2576e4941cd6ecefc4051bce382e.tar.gz | |
Python 2.6 include defines HAVE_COPYSIGN on fedora 11,so add it
to the list of possible conflicts. Maybe we should be prepending
a NPY_ to our defines?
Diffstat (limited to 'numpy/core/setup_common.py')
| -rw-r--r-- | numpy/core/setup_common.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index f560d09aa..670c2bb83 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -76,8 +76,8 @@ def check_api_version(apiversion, codegen_dir): "with checksum %s, but recorded checksum for C API version %d in " \ "codegen_dir/cversions.txt is %s. If functions were added in the " \ "C API, you have to update C_API_VERSION in %s." - warnings.warn(msg % (apiversion, curapi_hash, apiversion, api_hash, - __file__), + warnings.warn(msg % (apiversion, curapi_hash, apiversion, api_hash, + __file__), MismatchCAPIWarning) # Mandatory functions: if not found, fail the build MANDATORY_FUNCS = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs", @@ -87,10 +87,11 @@ MANDATORY_FUNCS = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs", # Standard functions which may not be available and for which we have a # replacement implementation. Note that some of these are C99 functions. OPTIONAL_STDFUNCS = ["expm1", "log1p", "acosh", "asinh", "atanh", - "rint", "trunc", "exp2", "log2", "copysign", "hypot", "atan2", "pow"] + "rint", "trunc", "exp2", "log2", "hypot", "atan2", "pow"] # Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h -OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh", "hypot"] +OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh", "hypot", + "copysign"] # C99 functions: float and long double versions C99_FUNCS = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs", "floor", |