* gcc.c-torture/execute/20000503-1.c: Fix typo.

[pf3gnuchains/gcc-fork.git] / libiberty / strtoul.c

diff --git a/libiberty/strtoul.c b/libiberty/strtoul.c
index 4090245..2ec3204 100644 (file)
--- a/libiberty/strtoul.c
+++ b/libiberty/strtoul.c
@@ -10,10 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
+ * 3. [rescinded 22 July 1999]
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -51,11 +48,11 @@
  */
 unsigned long
 strtoul(nptr, endptr, base)
-       CONST char *nptr;
+       const char *nptr;
        char **endptr;
        register int base;
 {
-       register CONST char *s = nptr;
+       register const char *s = nptr;
        register unsigned long acc;
        register int c;
        register unsigned long cutoff;
@@ -91,7 +88,7 @@ strtoul(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;