BUG: core: use #if check instead of #ifdef in checking HAVE_DECL_ISFINITE (ticket #1625)

pv · pv · commit 5a0ab023d8f8 · 2010-10-06T21:11:15.000+02:00
Python #defines HAVE_DECL_ISFINITE 0 when the function is not available,
so the proper check to do is #if.
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -215,10 +215,13 @@ def _add_decl(f):
     _macros = ["isnan", "isinf", "signbit", "isfinite"]
     if sys.version_info[:2] >= (2, 6):
         for f in _macros:
-            already_declared = config.check_decl(fname2def("decl_%s" % f),
+            py_symbol = fname2def("decl_%s" % f)
+            already_declared = config.check_decl(py_symbol,
                     headers=["Python.h", "math.h"])
             if already_declared:
-                pub.append('NPY_%s' % fname2def("decl_%s" % f))
+                if config.check_macro_true(py_symbol,
+                        headers=["Python.h", "math.h"]):
+                    pub.append('NPY_%s' % fname2def("decl_%s" % f))
             else:
                 macros.append(f)
     else:
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
@@ -169,6 +169,22 @@ def check_decl(self, symbol,
 
         return self.try_compile(body, headers, include_dirs)
 
+    def check_macro_true(self, symbol,
+                         headers=None, include_dirs=None):
+        self._check_compiler()
+        body = """
+int main()
+{
+#if %s
+#else
+#error false or undefined macro
+#endif
+    ;
+    return 0;
+}""" % (symbol,)
+
+        return self.try_compile(body, headers, include_dirs)
+
     def check_type(self, type_name, headers=None, include_dirs=None,
             library_dirs=None):
         """Check type availability. Return True if the type can be compiled,
