From 4561257c34f2966af31c7f9930ae04e775e5ee3d Mon Sep 17 00:00:00 2001 From: Andrew MacIntyre Date: Mon, 22 Sep 2008 14:49:01 +0000 Subject: [PATCH] Merged revisions 66552-66553 via svnmerge from 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 Part of source_os2emx.patch in issue 3868 Reviewed by Amaury Forgeot d'Arc ........ --- Objects/floatobject.c | 6 +++--- Python/pymath.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 63d67ab796d..6bf65e03c76 100644 --- 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 index 7c0010675a3..5cf61ab74c6 100644 --- a/Python/pymath.c +++ b/Python/pymath.c @@ -35,6 +35,8 @@ copysign(double x, double y) #endif /* HAVE_COPYSIGN */ #ifndef HAVE_LOG1P +#include + double log1p(double x) {