Remove old, dead code in last commit.

[gnulib.git] / lib / strtol.c

diff --git a/lib/strtol.c b/lib/strtol.c
index eda2d26..0b2c82a 100644 (file)
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,14 +1,15 @@
 /* Convert string representation of a number into an integer value.
 
 /* Convert string representation of a number into an integer value.
 

-   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005, 2006
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005,
+   2006, 2007

    Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 
    Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
    Library.  Bugs can be reported to bug-glibc@gnu.org.
 

-   This program is free software; you can redistribute it and/or modify it
+   This program is free software: you can redistribute it and/or modify it

    under the terms of the GNU General Public License as published by the
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any
+   Free Software Foundation; either version 3 of the License, or any

    later version.
 
    This program is distributed in the hope that it will be useful,
    later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,15 +18,12 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING
 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING

+#else
+# include <config.h>

 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>


@@ -189,9 +187,7 @@
 # define LOCALE_PARAM_PROTO
 #endif
 
 # define LOCALE_PARAM_PROTO
 #endif
 

-#if defined _LIBC || defined HAVE_WCHAR_H
-# include <wchar.h>
-#endif
+#include <wchar.h>

 
 #ifdef USE_WIDE_CHAR
 # include <wctype.h>
 
 #ifdef USE_WIDE_CHAR
 # include <wctype.h>


@@ -208,11 +204,6 @@
 #  define TOUPPER(Ch) towupper (Ch)
 # endif
 #else
 #  define TOUPPER(Ch) towupper (Ch)
 # endif
 #else

-# if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
-#  define IN_CTYPE_DOMAIN(c) 1
-# else
-#  define IN_CTYPE_DOMAIN(c) isascii(c)
-# endif

 # define L_(Ch) Ch
 # define UCHAR_TYPE unsigned char
 # define STRING_TYPE char
 # define L_(Ch) Ch
 # define UCHAR_TYPE unsigned char
 # define STRING_TYPE char


@@ -221,9 +212,9 @@
 #  define ISALPHA(Ch) __isalpha_l ((Ch), loc)
 #  define TOUPPER(Ch) __toupper_l ((Ch), loc)
 # else
 #  define ISALPHA(Ch) __isalpha_l ((Ch), loc)
 #  define TOUPPER(Ch) __toupper_l ((Ch), loc)
 # else

-#  define ISSPACE(Ch) (IN_CTYPE_DOMAIN (Ch) && isspace (Ch))
-#  define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch))
-#  define TOUPPER(Ch) (IN_CTYPE_DOMAIN (Ch) ? toupper (Ch) : (Ch))
+#  define ISSPACE(Ch) isspace (Ch)
+#  define ISALPHA(Ch) isalpha (Ch)
+#  define TOUPPER(Ch) toupper (Ch)

 # endif
 #endif
 
 # endif
 #endif