diff options
| author | Jesus Cea <jcea@jcea.es> | 2011-04-20 20:38:26 (GMT) |
|---|---|---|
| committer | Jesus Cea <jcea@jcea.es> | 2011-04-20 20:38:26 (GMT) |
| commit | 7365accc20a5dff590fe3d7af7ec01b7173a59ea (patch) | |
| tree | 9775b22f3c50568a2f67567ea832f8f1a8caf6da | |
| parent | fc330aeb6f6968d1b843b47c8d7f36a708eb5b0c (diff) | |
| parent | 2fc8b8749952144679b1f60ee8f9cfdd01d911a7 (diff) | |
| download | cpython-7365accc20a5dff590fe3d7af7ec01b7173a59ea.zip cpython-7365accc20a5dff590fe3d7af7ec01b7173a59ea.tar.gz cpython-7365accc20a5dff590fe3d7af7ec01b7173a59ea.tar.bz2 | |
merge heads
| -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 13396a2..17a5379 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -279,6 +279,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 300398e..4948a21 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 - #ifndef WITHOUT_COMPLEX /* elementary operations on complex numbers */ diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 6a2af74..8161ed5 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 */ |