summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-27 10:00:24 +0000
committerRoland McGrath <roland@gnu.org>1996-01-27 10:00:24 +0000
commiteb8c0f2de5fe3484a8c9922573c46e3789028bb0 (patch)
treed79786dec10621a484ebf6b0f18a865ca1ddb3a8
parent8dad333dcef9dc1116277b98987a42a1b38f74ea (diff)
Fri Jan 26 12:20:45 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>cvs/libc-960128cvs/libc-960127
* stdlib/strtol.c: Undo last change. ANSI C changed since the draft I checked yesterday. Sigh.
-rw-r--r--ChangeLog5
-rw-r--r--stdlib/strtol.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a1c7d6b327..3d949d2cc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 26 12:20:45 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+
+ * stdlib/strtol.c: Undo last change. ANSI C changed since the
+ draft I checked yesterday. Sigh.
+
Thu Jan 25 18:58:25 1996 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdlib/strtol.c [UNSIGNED]: Don't recognize + or - as sign.
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 2996603f95..b06063c2c5 100644
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -112,11 +112,7 @@ INTERNAL (strtol) (nptr, endptr, base, group)
int base;
int group;
{
-#if UNSIGNED
-#define negative 0
-#else
int negative;
-#endif
register unsigned LONG int cutoff;
register unsigned int cutlim;
register unsigned LONG int i;
@@ -162,7 +158,6 @@ INTERNAL (strtol) (nptr, endptr, base, group)
if (*s == '\0')
goto noconv;
-#if !UNSIGNED
/* Check for a sign. */
if (*s == '-')
{
@@ -176,7 +171,6 @@ INTERNAL (strtol) (nptr, endptr, base, group)
}
else
negative = 0;
-#endif
if (base == 16 && s[0] == '0' && toupper (s[1]) == 'X')
s += 2;