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
........
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 8916552..2ae397a 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -4336,14 +4336,16 @@
}
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';
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 6911058..e4f27e6 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8212,14 +8212,16 @@
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';