merge from gcc

[pf3gnuchains/pf3gnuchains3x.git] / libiberty / strtol.c

diff --git a/libiberty/strtol.c b/libiberty/strtol.c
index d9f54cc..acc7882 100644 (file)
--- a/libiberty/strtol.c
+++ b/libiberty/strtol.c
@@ -85,10 +85,7 @@ extern int errno;
  * alphabets and digits are each contiguous.
  */
 long
-strtol(nptr, endptr, base)
-       const char *nptr;
-       char **endptr;
-       register int base;
+strtol(const char *nptr, char **endptr, register int base)
 {
        register const char *s = nptr;
        register unsigned long acc;
@@ -147,7 +144,7 @@ strtol(nptr, endptr, base)
                        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;