Merged revisions 76561 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76561 | mark.dickinson | 2009-11-28 12:30:36 +0000 (Sat, 28 Nov 2009) | 5 lines

  Include ieeefp.h (when available) in pyport.h instead of individually in
  Objects/floatobject.c and Objects/complexobject.c.  This should silence
  compiler warnings about implicit declaration of the 'finite' function
  on Solaris.
........

diff --git a/Include/pyport.h b/Include/pyport.h
index 1adb5f0d02004e90d3e82f4f10646f69e7642175..9df74ce9895340bef94cd4aed963cfa96dff19a3 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -295,6 +295,10 @@ typedef Py_intptr_t        Py_ssize_t;
 
 #include <stdlib.h>
 
+#ifdef HAVE_IEEEFP_H
+#include <ieeefp.h>  /* needed for 'finite' declaration on some platforms */
+#endif
+
 #include <math.h> /* Moved here from the math section, before extern "C" */
 
 /********************************************

diff --git a/Objects/complexobject.c b/Objects/complexobject.c
index e5e07c1b6aa8d34b9561f880fcec301faebb09c6..562e41f6f98e769d7de3259e9860fa9efcfa135f 100644 (file)
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -8,10 +8,6 @@
 #include "Python.h"
 #include "structmember.h"
 
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
 /* elementary operations on complex numbers */
 
 static Py_complex c_1 = {1., 0.};

diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index ff5c0f6a699c655bf8c52c99e168b7b3d864173a..b281f815dc750a755014b1b8c39ef3e5a13d3217 100644 (file)
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -15,10 +15,6 @@
 #define MAX(x, y) ((x) < (y) ? (y) : (x))
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
 
 #ifdef _OSF_SOURCE
 /* OSF1 5.1 doesn't make this available with XOPEN_SOURCE_EXTENDED defined */