[Python-checkins] cpython (merge 3.1 -> 3.1): merge heads

Wed Apr 20 22:41:49 CEST 2011

http://hg.python.org/cpython/rev/b20d3f54366c
changeset: 69499:b20d3f54366c
branch: 3.1
parent: 69492:e9979852fc02
parent: 69496:358a0dd0a9f2
user: Jesus Cea <jcea at jcea.es>
date: Wed Apr 20 22:38:26 2011 +0200
summary:
 merge heads
files:
 Include/pyport.h | 4 ++++
 Objects/complexobject.c | 4 ----
 Objects/floatobject.c | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Include/pyport.h b/Include/pyport.h
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -279,6 +279,10 @@
 
 #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
--- 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
--- 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 */
-- 
Repository URL: http://hg.python.org/cpython
