projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid compilation errors with some C++ compilers.
[gnulib.git]
/
lib
/
strtol.c
diff --git
a/lib/strtol.c
b/lib/strtol.c
index
eed62c4
..
e409d28
100644
(file)
--- a/
lib/strtol.c
+++ b/
lib/strtol.c
@@
-1,6
+1,6
@@
/* 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
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
@@
-18,21
+18,16
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#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
@@
-127,9
+122,9
@@
extern int errno;
/* The extra casts in the following macros work around compiler bugs,
e.g., in Cray C 5.0.3.0. */
/* The extra casts in the following macros work around compiler bugs,
e.g., in Cray C 5.0.3.0. */
-/* True if negative values of the signed integer type T use twos
- complement, ones complement, or signed magnitude representation,
- respectively. Much GNU code assumes twos complement, but some
+/* True if negative values of the signed integer type T use two
'
s
+ complement, ones
'
complement, or signed magnitude representation,
+ respectively. Much GNU code assumes two
'
s complement, but some
people like to be portable to all possible C hosts. */
# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
people like to be portable to all possible C hosts. */
# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
@@
-211,11
+206,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
+214,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