diff options
| author | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2008-09-22 14:49:01 (GMT) |
|---|---|---|
| committer | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2008-09-22 14:49:01 (GMT) |
| commit | 4561257c34f2966af31c7f9930ae04e775e5ee3d (patch) | |
| tree | 397dd195bc74ff0f507e52e22eae08afee4c03a6 | |
| parent | a74e4bf4c3a4fb7ed71ff2cdca75bc0c41c2cc0a (diff) | |
| download | cpython-4561257c34f2966af31c7f9930ae04e775e5ee3d.zip cpython-4561257c34f2966af31c7f9930ae04e775e5ee3d.tar.gz cpython-4561257c34f2966af31c7f9930ae04e775e5ee3d.tar.bz2 | |
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 <float.h>
Part of source_os2emx.patch in issue 3868
Reviewed by Amaury Forgeot d'Arc
........
| -rw-r--r-- | Objects/floatobject.c | 6 | ||||
| -rw-r--r-- | Python/pymath.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Objects/floatobject.c b/Objects/floatobject.c index 63d67ab..6bf65e0 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 7c00106..5cf61ab 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 <float.h> + double log1p(double x) { |