projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert unwanted commit
[gnulib.git]
/
lib
/
strtol.c
diff --git
a/lib/strtol.c
b/lib/strtol.c
index
7788981
..
e14d3cf
100644
(file)
--- a/
lib/strtol.c
+++ b/
lib/strtol.c
@@
-1,6
+1,7
@@
/* 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
+ 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
Free Software Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C
@@
-20,19
+21,14
@@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#ifdef _LIBC
# define USE_NUMBER_GROUPING
#ifdef _LIBC
# define USE_NUMBER_GROUPING
+#else
+# include <config.h>
#endif
#include <ctype.h>
#include <errno.h>
#endif
#include <ctype.h>
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#ifndef __set_errno
# define __set_errno(Val) errno = (Val)
#endif
#ifndef __set_errno
# define __set_errno(Val) errno = (Val)
#endif
@@
-192,9
+188,7
@@
extern int errno;
# 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>
@@
-211,11
+205,6
@@
extern int errno;
# 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
@@
-224,9
+213,9
@@
extern int errno;
# 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