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
........
This commit is contained in:
Andrew MacIntyre 2008-09-22 14:49:01 +00:00
parent a74e4bf4c3
commit 4561257c34
2 changed files with 5 additions and 3 deletions

View File

@ -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;
}

View File

@ -35,6 +35,8 @@ copysign(double x, double y)
#endif /* HAVE_COPYSIGN */
#ifndef HAVE_LOG1P
#include <float.h>
double
log1p(double x)
{