changeset 2705:878e0f9373cf

* src/strtoull.cxx, src/strtoll.cxx, src/strtoul.cxx, src/strtoul.cxx: lisp'ify to avoid compiler warnings.
author asl
date Tue, 23 Dec 2008 23:41:42 +0000
parents 8419af81cd27
children 6f24331770ea
files packages/language/c/libc/stdlib/current/ChangeLog packages/language/c/libc/stdlib/current/src/strtol.cxx packages/language/c/libc/stdlib/current/src/strtoll.cxx packages/language/c/libc/stdlib/current/src/strtoul.cxx packages/language/c/libc/stdlib/current/src/strtoull.cxx
diffstat 5 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/packages/language/c/libc/stdlib/current/ChangeLog
+++ b/packages/language/c/libc/stdlib/current/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-23  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/strtoull.cxx, src/strtoll.cxx, src/strtoul.cxx, src/strtoul.cxx:
+	lisp'ify to avoid compiler warnings.
+
 2005-12-27  Sergei Organov  <osv@javad.com>
 
 	* src/strtod.cxx (Ise): 'd' and 'D' aren't allowed in floating
--- a/packages/language/c/libc/stdlib/current/src/strtol.cxx
+++ b/packages/language/c/libc/stdlib/current/src/strtol.cxx
@@ -179,7 +179,7 @@ strtol( const char *nptr, char **endptr,
             break;
         if (c >= base)
             break;
-        if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+        if ((any < 0) || (acc > cutoff) || ((acc == cutoff) && (c > cutlim)))
             any = -1;
         else {
             any = 1;
--- a/packages/language/c/libc/stdlib/current/src/strtoll.cxx
+++ b/packages/language/c/libc/stdlib/current/src/strtoll.cxx
@@ -175,7 +175,7 @@ strtoll( const char *nptr, char **endptr
             break;
         if (c >= base)
             break;
-        if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+        if ((any < 0) || (acc > cutoff) || ((acc == cutoff) && (c > cutlim)))
             any = -1;
         else {
             any = 1;
--- a/packages/language/c/libc/stdlib/current/src/strtoul.cxx
+++ b/packages/language/c/libc/stdlib/current/src/strtoul.cxx
@@ -155,7 +155,7 @@ strtoul( const char *nptr, char **endptr
             break;
         if (c >= base)
             break;
-        if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+        if ((any < 0) || (acc > cutoff) || ((acc == cutoff) && (c > cutlim)))
             any = -1;
         else {
             any = 1;
--- a/packages/language/c/libc/stdlib/current/src/strtoull.cxx
+++ b/packages/language/c/libc/stdlib/current/src/strtoull.cxx
@@ -151,7 +151,7 @@ strtoull( const char *nptr, char **endpt
             break;
         if (c >= base)
             break;
-        if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+        if ((any < 0) || (acc > cutoff) || ((acc == cutoff) && (c > cutlim)))
             any = -1;
         else {
             any = 1;