Merged revisions 66552-66553 via svnmerge from

Andrew MacIntyre · Andrew MacIntyre · commit 4561257c34f2 · 2008-09-22T14:49:01.000Z
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66552 | andrew.macintyre | 2008-09-23 00:10:54 +1000 (Tue, 23 Sep 2008) | 5 lines

  should use macro'ed symbols not direct

  Part of source_os2emx.patch in issue 3868
  Reviewed by Amaury Forgeot d'Arc
........
  r66553 | andrew.macintyre | 2008-09-23 00:11:41 +1000 (Tue, 23 Sep 2008) | 5 lines

  any platform without HAVE_LOG1P should have DBL_EPSILON in &lt;float.h&gt;

  Part of source_os2emx.patch in issue 3868
  Reviewed by Amaury Forgeot d'Arc
........
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
@@ -1248,12 +1248,12 @@ float_fromhex(PyObject *cls, PyObject *arg)
 		s++;
 
 	/* infinities and nans */
-	if (PyOS_mystrnicmp(s, "nan", 4) == 0) {
+	if (PyOS_strnicmp(s, "nan", 4) == 0) {
 		x = Py_NAN;
 		goto finished;
 	}
-	if (PyOS_mystrnicmp(s, "inf", 4) == 0 ||
-	    PyOS_mystrnicmp(s, "infinity", 9) == 0) {
+	if (PyOS_strnicmp(s, "inf", 4) == 0 ||
+	    PyOS_strnicmp(s, "infinity", 9) == 0) {
 		x = sign*Py_HUGE_VAL;
 		goto finished;
 	}
diff --git a/Python/pymath.c b/Python/pymath.c
@@ -35,6 +35,8 @@ copysign(double x, double y)
 #endif /* HAVE_COPYSIGN */
 
 #ifndef HAVE_LOG1P
+#include <float.h>
+
 double
 log1p(double x)
 {

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ copysign(double x, double y)`
`35`	`35`	`#endif /* HAVE_COPYSIGN */`
`36`	`36`
`37`	`37`	`#ifndef HAVE_LOG1P`
	`38`	`+#include <float.h>`
	`39`	`+`
`38`	`40`	`double`
`39`	`41`	`log1p(double x)`
`40`	`42`	`{`