diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2009-11-28 12:35:42 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2009-11-28 12:35:42 (GMT) |
| commit | a4962cb694c5fc7ae53f762a682cdc1ca72410ee (patch) | |
| tree | 81707d1e151f05757e9eed909a71e4c40813852a | |
| parent | 1b83a45f90ca8ca7c525f122ed3078dc6c59c44a (diff) | |
| download | cpython-a4962cb694c5fc7ae53f762a682cdc1ca72410ee.zip cpython-a4962cb694c5fc7ae53f762a682cdc1ca72410ee.tar.gz cpython-a4962cb694c5fc7ae53f762a682cdc1ca72410ee.tar.bz2 | |
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.
........
| -rw-r--r-- | Include/pyport.h | 4 | ||||
| -rw-r--r-- | Objects/complexobject.c | 4 | ||||
| -rw-r--r-- | Objects/floatobject.c | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Include/pyport.h b/Include/pyport.h index 1adb5f0..9df74ce 100644 --- 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 e5e07c1..562e41f 100644 --- 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 ff5c0f6..b281f81 100644 --- 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 */ |