Merged revisions 74575 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74575 | mark.dickinson | 2009-08-28 21:46:24 +0100 (Fri, 28 Aug 2009) | 1 line

  Silence gcc 'comparison always false' warning
........
This commit is contained in:
Mark Dickinson 2009-08-28 20:57:42 +00:00
parent 4bd4e235bd
commit 75be68bd10
2 changed files with 6 additions and 2 deletions

View File

@ -4336,14 +4336,16 @@ formatfloat(char *buf, size_t buflen, int flags,
}
if (prec < 0)
prec = 6;
#if SIZEOF_INT > 4
/* make sure that the decimal representation of precision really does
need at most 10 digits: platforms with sizeof(int) == 8 exist! */
if (prec > 0x7fffffffL) {
if (prec > 0x7fffffff) {
PyErr_SetString(PyExc_OverflowError,
"outrageously large precision "
"for formatted float");
return -1;
}
#endif
if (type == 'f' && fabs(x) >= 1e50)
type = 'g';

View File

@ -8212,14 +8212,16 @@ formatfloat(Py_UNICODE *buf,
return -1;
if (prec < 0)
prec = 6;
#if SIZEOF_INT > 4
/* make sure that the decimal representation of precision really does
need at most 10 digits: platforms with sizeof(int) == 8 exist! */
if (prec > 0x7fffffffL) {
if (prec > 0x7fffffff) {
PyErr_SetString(PyExc_OverflowError,
"outrageously large precision "
"for formatted float");
return -1;
}
#endif
if (type == 'f' && fabs(x) >= 1e50)
type = 'g';