diff options
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/Makefile.am | 23 | ||||
| -rw-r--r-- | lib/stdint_.h | 541 | ||||
| -rw-r--r-- | m4/ChangeLog | 6 | ||||
| -rw-r--r-- | m4/longlong.m4 | 39 | ||||
| -rw-r--r-- | m4/stdint.m4 | 368 | ||||
| -rw-r--r-- | m4/ulonglong.m4 | 38 |
7 files changed, 759 insertions, 261 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 5963bf532..94551cf8c 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2006-07-02 Paul Eggert <eggert@cs.ucla.edu> + + * Makefile.am (stdint.h): Sync from gnulib. + * stdint_.h: Sync from gnulib. + 2006-06-30 Paul Eggert <eggert@cs.ucla.edu> * xstrtod.c (XSTRTOD, DOUBLE): New macros, so that we can support diff --git a/lib/Makefile.am b/lib/Makefile.am index 87c6a1ed4..5a6be2ab5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -136,7 +136,28 @@ EXTRA_DIST += stdint_.h # We need the following in order to create <stdint.h> when the system # doesn't have one that works with the given compiler. stdint.h: stdint_.h - sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONG_LONG_64BIT@/$(HAVE_LONG_LONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t + sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ + -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ + -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ + -e 's|@''FULL_PATH_STDINT_H''@|$(FULL_PATH_STDINT_H)|g' \ + -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ + -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ + -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ + -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ + -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ + -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ + -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ + -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ + -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ + -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ + -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ + -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ + -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ + -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ + < $(srcdir)/stdint_.h > $@-t mv $@-t $@ MOSTLYCLEANFILES += stdint.h stdint.h-t diff --git a/lib/stdint_.h b/lib/stdint_.h index 29feaee5a..4e582911a 100644 --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -1,5 +1,5 @@ /* Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc. - Written by Bruno Haible, Sam Steingold, Peter Burwood. + Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. This program is free software; you can redistribute it and/or modify @@ -16,284 +16,435 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _STDINT_H -#define _STDINT_H +#ifndef _GL_STDINT_H +#define _GL_STDINT_H /* * ISO C 99 <stdint.h> for platforms that lack it. - * <http://www.opengroup.org/onlinepubs/007904975/basedefs/stdint.h.html> + * <http://www.opengroup.org/susv3xbd/stdint.h.html> */ -/* Get wchar_t, WCHAR_MIN, WCHAR_MAX. */ -#include <stddef.h> -/* Get CHAR_BIT, LONG_MIN, LONG_MAX, ULONG_MAX. */ +/* Get those types that are already defined in other system include + files, so that we can "#define int8_t signed char" below without + worrying about a later system include file containing a "typedef + signed char int8_t;" that will get messed up by our macro. Our + macros should all be consistent with the system versions, except + for the "fast" types and macros, which we recommend against using + in public interfaces due to compiler differences. */ + +/* <sys/types.h> defines some of the stdint.h types as well, on glibc, + IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>). */ +#if @HAVE_SYS_TYPES_H@ +# include <sys/types.h> +#endif + +/* Get LONG_MIN, LONG_MAX, ULONG_MAX. */ #include <limits.h> -/* Get those types that are already defined in other system include files. */ -#if defined __FreeBSD__ -# include <sys/inttypes.h> +#if @HAVE_STDINT_H@ +# if defined __sgi && ! defined __c99 + /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users + with "This header file is to be used only for c99 mode compilations" + diagnostics. */ +# define __STDINT_H__ +# endif + /* Other systems may have an incomplete or buggy <stdint.h>. + Include it before <inttypes.h>, since any "#include <stdint.h>" + in <inttypes.h> would reinclude us, skipping our contents because + _GL_STDINT_H is defined. */ +# include @FULL_PATH_STDINT_H@ +#endif + +#if @HAVE_INTTYPES_H@ + /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines + int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. + <inttypes.h> also defines intptr_t and uintptr_t. */ +# include <inttypes.h> #endif -#if defined __linux__ && HAVE_SYS_BITYPES_H + +#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is included by <sys/types.h>. */ # include <sys/bitypes.h> #endif -#if defined __sun && HAVE_SYS_INTTYPES_H -# include <sys/inttypes.h> + +#if @HAVE_SYS_INTTYPES_H@ && !@HAVE_INTTYPES_H@ /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. But note that <sys/int_types.h> contains only the type definitions! */ -# define _STDINT_H_HAVE_SYSTEM_INTTYPES -#endif -#if (defined __hpux || defined _AIX) && HAVE_INTTYPES_H -# include <inttypes.h> - /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX, - UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX. */ - /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX, - UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX. */ -# define _STDINT_H_HAVE_SYSTEM_INTTYPES -#endif -#if !((defined UNIX_CYGWIN32 || defined __linux__) && defined __BIT_TYPES_DEFINED__) -# define _STDINT_H_NEED_SIGNED_INT_TYPES +# include <sys/inttypes.h> #endif -#if !defined _STDINT_H_HAVE_SYSTEM_INTTYPES - -/* 7.18.1.1. Exact-width integer types */ +#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS -#if !defined __FreeBSD__ +/* Get WCHAR_MIN, WCHAR_MAX. */ +# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) + /* BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before + <wchar.h>. */ +# include <stdio.h> +# include <time.h> +# include <wchar.h> +# endif -#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES -typedef signed char int8_t; #endif -typedef unsigned char uint8_t; -#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES -typedef short int16_t; -#endif -typedef unsigned short uint16_t; +/* Minimum and maximum values for a integer type under the usual assumption. + Return an unspecified value if BITS == 0, adding a check to pacify + picky compilers. */ -#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES -typedef int int32_t; -#endif -typedef unsigned int uint32_t; +#define _STDINT_MIN(signed, bits, zero) \ + ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero)) -#if @HAVE_LONG_64BIT@ -#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES -typedef long int64_t; -#endif -typedef unsigned long uint64_t; -#define _STDINT_H_HAVE_INT64 -#elif @HAVE_LONG_LONG_64BIT@ -#ifdef _STDINT_H_NEED_SIGNED_INT_TYPES -typedef long long int64_t; -#endif -typedef unsigned long long uint64_t; -#define _STDINT_H_HAVE_INT64 +#define _STDINT_MAX(signed, bits, zero) \ + ((signed) \ + ? ~ _STDINT_MIN (signed, bits, zero) \ + : ((((zero) + 1) << ((bits) ? (bits) - 1 : 0)) - 1) * 2 + 1) + +/* 7.18.1.1. Exact-width integer types */ + +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. */ + +#undef int8_t +#undef uint8_t +#define int8_t signed char +#define uint8_t unsigned char + +#undef int16_t +#undef uint16_t +#define int16_t short int +#define uint16_t unsigned short int + +#undef int32_t +#undef uint32_t +#define int32_t int +#define uint32_t unsigned int + +#undef int64_t +#undef uint64_t +#if LONG_MAX >> 31 >> 31 == 1 +# define int64_t long int +# define uint64_t unsigned long int #elif defined _MSC_VER -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#define _STDINT_H_HAVE_INT64 +# define int64_t __int64 +# define uint64_t unsigned __int64 +#elif @HAVE_LONG_LONG_INT@ +# define int64_t long long int +# define uint64_t unsigned long long int #endif -#endif /* !FreeBSD */ +/* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */ +#define _UINT8_T +#define _UINT32_T +#define _UINT64_T + /* 7.18.1.2. Minimum-width integer types */ -typedef int8_t int_least8_t; -typedef uint8_t uint_least8_t; -typedef int16_t int_least16_t; -typedef uint16_t uint_least16_t; -typedef int32_t int_least32_t; -typedef uint32_t uint_least32_t; -#ifdef _STDINT_H_HAVE_INT64 -typedef int64_t int_least64_t; -typedef uint64_t uint_least64_t; +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types + are the same as the corresponding N_t types. */ + +#undef int_least8_t +#undef uint_least8_t +#undef int_least16_t +#undef uint_least16_t +#undef int_least32_t +#undef uint_least32_t +#undef int_least64_t +#undef uint_least64_t +#define int_least8_t int8_t +#define uint_least8_t uint8_t +#define int_least16_t int16_t +#define uint_least16_t uint16_t +#define int_least32_t int32_t +#define uint_least32_t uint32_t +#ifdef int64_t +# define int_least64_t int64_t +# define uint_least64_t uint64_t #endif /* 7.18.1.3. Fastest minimum-width integer types */ -typedef int32_t int_fast8_t; -typedef uint32_t uint_fast8_t; -typedef int32_t int_fast16_t; -typedef uint32_t uint_fast16_t; -typedef int32_t int_fast32_t; -typedef uint32_t uint_fast32_t; -#ifdef _STDINT_H_HAVE_INT64 -typedef int64_t int_fast64_t; -typedef uint64_t uint_fast64_t; +/* Note: Other <stdint.h> substitutes may define these types differently. + It is not recommended to use these types in public header files. */ + +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types + are taken from the same list of types. Assume that 'long int' + is fast enough for all narrower integers. */ + +#undef int_fast8_t +#undef uint_fast8_t +#undef int_fast16_t +#undef uint_fast16_t +#undef int_fast32_t +#undef uint_fast32_t +#undef int_fast64_t +#undef uint_fast64_t +#define int_fast8_t long int +#define uint_fast8_t unsigned int_fast8_t +#define int_fast16_t long int +#define uint_fast16_t unsigned int_fast16_t +#define int_fast32_t long int +#define uint_fast32_t unsigned int_fast32_t +#ifdef int64_t +# define int_fast64_t int64_t +# define uint_fast64_t uint64_t #endif /* 7.18.1.4. Integer types capable of holding object pointers */ -#if !defined __FreeBSD__ - -/* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long), - but this doesn't matter here. */ -typedef long intptr_t; -typedef unsigned long uintptr_t; - -#endif /* !FreeBSD */ +#undef intptr_t +#undef uintptr_t +#define intptr_t long int +#define uintptr_t unsigned long int /* 7.18.1.5. Greatest-width integer types */ -#ifdef _STDINT_H_HAVE_INT64 -# ifndef intmax_t -typedef int64_t intmax_t; -# endif -# ifndef uintmax_t -typedef uint64_t uintmax_t; -# endif +/* Note: These types are compiler dependent. It may be unwise to use them in + public header files. */ + +#undef intmax_t +#undef uintmax_t +#if @HAVE_LONG_LONG_INT@ +# define intmax_t long long int +# define uintmax_t unsigned long long int +#elif defined int64_t +# define intmax_t int64_t +# define uintmax_t uint64_t #else -# ifndef intmax_t -typedef int32_t intmax_t; -# endif -# ifndef uintmax_t -typedef uint32_t uintmax_t; -# endif +# define intmax_t long int +# define uintmax_t unsigned long int #endif /* 7.18.2. Limits of specified-width integer types */ -#if !defined __cplusplus || defined __STDC_LIMIT_MACROS +#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS /* 7.18.2.1. Limits of exact-width integer types */ -#define INT8_MIN -128 -#define INT8_MAX 127 -#define UINT8_MAX 255U -#define INT16_MIN -32768 -#define INT16_MAX 32767 -#define UINT16_MAX 65535U -#define INT32_MIN (~INT32_MAX) -#define INT32_MAX 2147483647 +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. */ + +#undef INT8_MIN +#undef INT8_MAX +#undef UINT8_MAX +#define INT8_MIN (~ INT8_MAX) +#define INT8_MAX 127 +#define UINT8_MAX 255 + +#undef INT16_MIN +#undef INT16_MAX +#undef UINT16_MAX +#define INT16_MIN (~ INT16_MAX) +#define INT16_MAX 32767 +#define UINT16_MAX 65535 + +#undef INT32_MIN +#undef INT32_MAX +#undef UINT32_MAX +#define INT32_MIN (~ INT32_MAX) +#define INT32_MAX 2147483647 #define UINT32_MAX 4294967295U -#ifdef _STDINT_H_HAVE_INT64 -#define INT64_MIN (~INT64_MAX) -#if @HAVE_LONG_64BIT@ -#define INT64_MAX 9223372036854775807L -#define UINT64_MAX 18446744073709551615UL -#elif @HAVE_LONG_LONG_64BIT@ -#define INT64_MAX 9223372036854775807LL -#define UINT64_MAX 18446744073709551615ULL -#elif defined _MSC_VER -#define INT64_MAX 9223372036854775807i64 -#define UINT64_MAX 18446744073709551615ui64 -#endif + +#undef INT64_MIN +#undef INT64_MAX +#undef UINT64_MAX +#ifdef int64_t +# define INT64_MIN (~ INT64_MAX) +# define INT64_MAX INTMAX_C (9223372036854775807) +# define UINT64_MAX UINTMAX_C (18446744073709551615) #endif /* 7.18.2.2. Limits of minimum-width integer types */ -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define UINT_LEAST8_MAX UINT8_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define UINT_LEAST16_MAX UINT16_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define UINT_LEAST32_MAX UINT32_MAX -#ifdef _STDINT_H_HAVE_INT64 -#define INT_LEAST64_MIN INT64_MIN -#define INT_LEAST64_MAX INT64_MAX -#define UINT_LEAST64_MAX UINT64_MAX +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types + are the same as the corresponding N_t types. */ + +#undef INT_LEAST8_MIN +#undef INT_LEAST8_MAX +#undef UINT_LEAST8_MAX +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define UINT_LEAST8_MAX UINT8_MAX + +#undef INT_LEAST16_MIN +#undef INT_LEAST16_MAX +#undef UINT_LEAST16_MAX +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define UINT_LEAST16_MAX UINT16_MAX + +#undef INT_LEAST32_MIN +#undef INT_LEAST32_MAX +#undef UINT_LEAST32_MAX +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define UINT_LEAST32_MAX UINT32_MAX + +#undef INT_LEAST64_MIN +#undef INT_LEAST64_MAX +#undef UINT_LEAST64_MAX +#ifdef int64_t +# define INT_LEAST64_MIN INT64_MIN +# define INT_LEAST64_MAX INT64_MAX +# define UINT_LEAST64_MAX UINT64_MAX #endif /* 7.18.2.3. Limits of fastest minimum-width integer types */ -#define INT_FAST8_MIN INT32_MIN -#define INT_FAST8_MAX INT32_MAX -#define UINT_FAST8_MAX UINT32_MAX -#define INT_FAST16_MIN INT32_MIN -#define INT_FAST16_MAX INT32_MAX -#define UINT_FAST16_MAX UINT32_MAX -#define INT_FAST32_MIN INT32_MIN -#define INT_FAST32_MAX INT32_MAX -#define UINT_FAST32_MAX UINT32_MAX -#ifdef _STDINT_H_HAVE_INT64 -#define INT_FAST64_MIN INT64_MIN -#define INT_FAST64_MAX INT64_MAX -#define UINT_FAST64_MAX UINT64_MAX +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types + are taken from the same list of types. */ + +#undef INT_FAST8_MIN +#undef INT_FAST8_MAX +#undef UINT_FAST8_MAX +#define INT_FAST8_MIN LONG_MIN +#define INT_FAST8_MAX LONG_MAX +#define UINT_FAST8_MAX ULONG_MAX + +#undef INT_FAST16_MIN +#undef INT_FAST16_MAX +#undef UINT_FAST16_MAX +#define INT_FAST16_MIN LONG_MIN +#define INT_FAST16_MAX LONG_MAX +#define UINT_FAST16_MAX ULONG_MAX + +#undef INT_FAST32_MIN +#undef INT_FAST32_MAX +#undef UINT_FAST32_MAX +#define INT_FAST32_MIN LONG_MIN +#define INT_FAST32_MAX LONG_MAX +#define UINT_FAST32_MAX ULONG_MAX + +#undef INT_FAST64_MIN +#undef INT_FAST64_MAX +#undef UINT_FAST64_MAX +#ifdef int64_t +# define INT_FAST64_MIN INT64_MIN +# define INT_FAST64_MAX INT64_MAX +# define UINT_FAST64_MAX UINT64_MAX #endif /* 7.18.2.4. Limits of integer types capable of holding object pointers */ -#define INTPTR_MIN LONG_MIN -#define INTPTR_MAX LONG_MAX -#define UINTPTR_MAX ULONG_MAX +#undef INTPTR_MIN +#undef INTPTR_MAX +#undef UINTPTR_MAX +#define INTPTR_MIN LONG_MIN +#define INTPTR_MAX LONG_MAX +#define UINTPTR_MAX ULONG_MAX /* 7.18.2.5. Limits of greatest-width integer types */ -#ifdef _STDINT_H_HAVE_INT64 -#define INTMAX_MIN INT64_MIN -#define INTMAX_MAX INT64_MAX -#define UINTMAX_MAX UINT64_MAX +#undef INTMAX_MIN +#undef INTMAX_MAX +#undef UINTMAX_MAX +#define INTMAX_MIN (~ INTMAX_MAX) +#ifdef INT64_MAX +# define INTMAX_MAX INT64_MAX +# define UINTMAX_MAX UINT64_MAX #else -#define INTMAX_MIN INT32_MIN -#define INTMAX_MAX INT32_MAX -#define UINTMAX_MAX UINT32_MAX +# define INTMAX_MAX INT32_MAX +# define UINTMAX_MAX UINT32_MAX #endif /* 7.18.3. Limits of other integer types */ -#define PTRDIFF_MIN (~(ptrdiff_t)0 << (sizeof(ptrdiff_t)*CHAR_BIT-1)) -#define PTRDIFF_MAX (~PTRDIFF_MIN) - -/* This may be wrong... */ -#define SIG_ATOMIC_MIN 0 -#define SIG_ATOMIC_MAX 127 - -#ifndef SIZE_MAX /* SIZE_MAX may also be defined in config.h. */ -# define SIZE_MAX ((size_t)~(size_t)0) -#endif - -/* wchar_t limits already defined in <stddef.h>. */ -/* wint_t limits already defined in <wchar.h>. */ - -#endif +/* ptrdiff_t limits */ +#undef PTRDIFF_MIN +#undef PTRDIFF_MAX +#define PTRDIFF_MIN \ + _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +#define PTRDIFF_MAX \ + _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) + +/* sig_atomic_t limits */ +#undef SIG_ATOMIC_MIN +#undef SIG_ATOMIC_MAX +#define SIG_ATOMIC_MIN \ + _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ + 0@SIG_ATOMIC_T_SUFFIX@) +#define SIG_ATOMIC_MAX \ + _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ + 0@SIG_ATOMIC_T_SUFFIX@) + + +/* size_t limit */ +#undef SIZE_MAX +#define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) + +/* wchar_t limits */ +#undef WCHAR_MIN +#undef WCHAR_MAX +#define WCHAR_MIN \ + _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +#define WCHAR_MAX \ + _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) + +/* wint_t limits */ +#undef WINT_MIN +#undef WINT_MAX +#define WINT_MIN \ + _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) +#define WINT_MAX \ + _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) /* 7.18.4. Macros for integer constants */ -#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS - /* 7.18.4.1. Macros for minimum-width integer constants */ +/* According to ISO C 99 Technical Corrigendum 1 */ + +/* Here we assume a standard architecture where the hardware integer + types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */ +#undef INT8_C +#undef UINT8_C #define INT8_C(x) x -#define UINT8_C(x) x##U +#define UINT8_C(x) x + +#undef INT16_C +#undef UINT16_C #define INT16_C(x) x -#define UINT16_C(x) x##U +#define UINT16_C(x) x + +#undef INT32_C +#undef UINT32_C #define INT32_C(x) x -#define UINT32_C(x) x##U -#if @HAVE_LONG_64BIT@ -#define INT64_C(x) x##L -#define UINT64_C(x) x##UL -#elif @HAVE_LONG_LONG_64BIT@ -#define INT64_C(x) x##LL -#define UINT64_C(x) x##ULL +#define UINT32_C(x) x ## U + +#undef INT64_C +#undef UINT64_C +#if LONG_MAX >> 31 >> 31 == 1 +# define INT64_C(x) x##L +# define UINT64_C(x) x##UL #elif defined _MSC_VER -#define INT64_C(x) x##i64 -#define UINT64_C(x) x##ui64 +# define INT64_C(x) x##i64 +# define UINT64_C(x) x##ui64 +#elif @HAVE_LONG_LONG_INT@ +# define INT64_C(x) x##LL +# define UINT64_C(x) x##ULL #endif /* 7.18.4.2. Macros for greatest-width integer constants */ -#if @HAVE_LONG_64BIT@ -#define INTMAX_C(x) x##L -#define UINTMAX_C(x) x##UL -#elif @HAVE_LONG_LONG_64BIT@ -#define INTMAX_C(x) x##LL -#define UINTMAX_C(x) x##ULL -#elif defined _MSC_VER -#define INTMAX_C(x) x##i64 -#define UINTMAX_C(x) x##ui64 +#undef INTMAX_C +#undef UINTMAX_C +#if @HAVE_LONG_LONG_INT@ +# define INTMAX_C(x) x##LL +# define UINTMAX_C(x) x##ULL +#elif defined int64_t +# define INTMAX_C(x) INT64_C(x) +# define UINTMAX_C(x) UINT64_C(x) #else -#define INTMAX_C(x) x -#define UINTMAX_C(x) x##U -#endif - +# define INTMAX_C(x) x##L +# define UINTMAX_C(x) x##UL #endif -#endif /* !_STDINT_H_HAVE_SYSTEM_INTTYPES */ +#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */ -#endif /* _STDINT_H */ +#endif /* _GL_STDINT_H */ diff --git a/m4/ChangeLog b/m4/ChangeLog index f4160c54f..481bfcc72 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2006-07-02 Paul Eggert <eggert@cs.ucla.edu> + + * longlong.m4: Sync from gnulib. + * stdint.m4: Likewise. + * ulonglong.m4: Likewise. + 2006-06-30 Paul Eggert <eggert@cs.ucla.edu> * c-strtod.m4 (gl_C_STRTOLD): Add c-strtod.c to LIBSOURCES. diff --git a/m4/longlong.m4 b/m4/longlong.m4 index 7b399e012..ea7c485c3 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,21 +1,42 @@ -# longlong.m4 serial 5 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. +# longlong.m4 serial 6 +dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Paul Eggert. -# Define HAVE_LONG_LONG if 'long long' works. +# Define HAVE_LONG_LONG_INT if 'long long int' works. +# This fixes a bug in Autoconf 2.60, but can be removed once we +# assume 2.61 everywhere. +AC_DEFUN([AC_TYPE_LONG_LONG_INT], +[ + AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + typedef int a[((-9223372036854775807LL < 0 + && 0 < 9223372036854775807ll) + ? 1 : -1)]; + int i = 63;]], + [[long long int llmax = 9223372036854775807ll; + return (ll << 63 | ll >> 63 | ll < i | ll > i + | llmax / ll | llmax % ll);]])], + [ac_cv_type_long_long_int=yes], + [ac_cv_type_long_long_int=no])]) + if test $ac_cv_type_long_long_int = yes; then + AC_DEFINE([HAVE_LONG_LONG_INT], 1, + [Define to 1 if the system has the type `long long int'.]) + fi +]) + +# This macro is obsolescent and should go away soon. AC_DEFUN([gl_AC_TYPE_LONG_LONG], [ - AC_CACHE_CHECK([for long long], ac_cv_type_long_long, - [AC_TRY_LINK([long long ll = 1LL; int i = 63;], - [long long llmax = (long long) -1; - return ll << i | ll >> i | llmax / ll | llmax % ll;], - ac_cv_type_long_long=yes, - ac_cv_type_long_long=no)]) + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + ac_cv_type_long_long=$ac_cv_type_long_long_int if test $ac_cv_type_long_long = yes; then AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have the 'long long' type.]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index d4a6994c4..aa6b96256 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,60 +1,334 @@ -# stdint.m4 serial 5 -dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc. +# stdint.m4 serial 12 +dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl From Bruno Haible. +dnl From Paul Eggert and Bruno Haible. dnl Test whether <stdint.h> is supported or must be substituted. AC_DEFUN([gl_STDINT_H], -[dnl Check for <inttypes.h>. -AC_REQUIRE([gt_HEADER_INTTYPES_H]) -dnl Check for <sys/inttypes.h>. -AC_CHECK_HEADERS([sys/inttypes.h]) -dnl Check for <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5). -AC_CHECK_HEADERS([sys/bitypes.h]) - -AC_MSG_CHECKING([for stdint.h]) -AC_CACHE_VAL(gl_cv_header_stdint_h, [ - AC_TRY_COMPILE([#include <stdint.h>], [], - gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)]) -AC_MSG_RESULT([$gl_cv_header_stdint_h]) -if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE(HAVE_STDINT_H, 1, - [Define if you have a working <stdint.h> header file.]) - STDINT_H='' -else - STDINT_H='stdint.h' - - dnl Is long == int64_t ? - AC_CACHE_CHECK([whether 'long' is 64 bit wide], gl_cv_long_bitsize_64, [ - AC_TRY_COMPILE([ -#define POW63 ((((((long) 1 << 15) << 15) << 15) << 15) << 3) -#define POW64 ((((((long) 1 << 15) << 15) << 15) << 15) << 4) -typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; -], , gl_cv_long_bitsize_64=yes, gl_cv_long_bitsize_64=no)]) - if test $gl_cv_long_bitsize_64 = yes; then - HAVE_LONG_64BIT=1 +[ + AC_PREREQ(2.59)dnl + + dnl Check for long long int. + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + if test $ac_cv_type_long_long_int = yes; then + HAVE_LONG_LONG_INT=1 else - HAVE_LONG_64BIT=0 + HAVE_LONG_LONG_INT=0 fi - AC_SUBST(HAVE_LONG_64BIT) - - dnl Is long long == int64_t ? - AC_CACHE_CHECK([whether 'long long' is 64 bit wide], gl_cv_longlong_bitsize_64, [ - AC_TRY_COMPILE([ -#define POW63 ((((((long long) 1 << 15) << 15) << 15) << 15) << 3) -#define POW64 ((((((long long) 1 << 15) << 15) << 15) << 15) << 4) -typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; -], , gl_cv_longlong_bitsize_64=yes, gl_cv_longlong_bitsize_64=no)]) - if test $gl_cv_longlong_bitsize_64 = yes; then - HAVE_LONG_LONG_64BIT=1 + AC_SUBST([HAVE_LONG_LONG_INT]) + + dnl Check for <wchar.h>. + AC_CHECK_HEADERS_ONCE([wchar.h]) + if test $ac_cv_header_wchar_h = yes; then + HAVE_WCHAR_H=1 else - HAVE_LONG_LONG_64BIT=0 + HAVE_WCHAR_H=0 fi - AC_SUBST(HAVE_LONG_LONG_64BIT) + AC_SUBST([HAVE_WCHAR_H]) + + dnl Check for <inttypes.h>. + dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h. + if test $ac_cv_header_inttypes_h = yes; then + HAVE_INTTYPES_H=1 + else + HAVE_INTTYPES_H=0 + fi + AC_SUBST([HAVE_INTTYPES_H]) + + dnl Check for <sys/types.h>. + dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h. + if test $ac_cv_header_sys_types_h = yes; then + HAVE_SYS_TYPES_H=1 + else + HAVE_SYS_TYPES_H=0 + fi + AC_SUBST([HAVE_SYS_TYPES_H]) + + dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_stdint_h. + if test $ac_cv_header_stdint_h = yes; then + gl_FULL_HEADER_PATH([stdint.h]) + FULL_PATH_STDINT_H="<$gl_cv_full_path_stdint_h>" + AC_SUBST([FULL_PATH_STDINT_H]) + HAVE_STDINT_H=1 + else + HAVE_STDINT_H=0 + fi + AC_SUBST([HAVE_STDINT_H]) + + dnl Now see whether we need a substitute <stdint.h>. Use + dnl FULL_PATH_STDINT_H, not <stdint.h>, so that it also works during + dnl a "config.status --recheck" if a stdint.h has been + dnl created in the build directory. + if test $ac_cv_header_stdint_h = yes; then + AC_CACHE_CHECK([whether stdint.h conforms to C99], + [gl_cv_header_working_stdint_h], + [gl_cv_header_working_stdint_h=no + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#include <stddef.h> +#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ +#include FULL_PATH_STDINT_H +#ifdef INT8_MAX +int8_t a1 = INT8_MAX; +#endif +#ifdef INT16_MAX +int16_t a2 = INT16_MAX; +#endif +#ifdef INT32_MAX +int32_t a3 = INT32_MAX; +#endif +#ifdef INT64_MAX +int64_t a4 = INT64_MAX; +#endif +#ifdef UINT8_MAX +uint8_t b1 = UINT8_MAX; +#else +typedef int b1[(unsigned char) -1 != 255 ? 1 : -1]; +#endif +#ifdef UINT16_MAX +uint16_t b2 = UINT16_MAX; +#endif +#ifdef UINT32_MAX +uint32_t b3 = UINT32_MAX; +#endif +#ifdef UINT64_MAX +uint64_t b4 = UINT64_MAX; +#endif +int_least8_t c1 = INT8_C (0x7f); +int_least16_t c2 = INT16_C (0x7fff); +int_least32_t c3 = INT32_C (0x7fffffff); +int_least64_t c4 = INT64_C (0x7fffffffffffffff); +uint_least8_t d1 = UINT8_C (0xff); +uint_least16_t d2 = UINT16_C (0xffff); +uint_least32_t d3 = UINT32_C (0xffffffff); +uint_least64_t d4 = UINT64_C (0xffffffffffffffff); +int_fast8_t e1 = INT_FAST8_MAX; +int_fast16_t e2 = INT_FAST16_MAX; +int_fast32_t e3 = INT_FAST32_MAX; +int_fast64_t e4 = INT_FAST64_MAX; +uint_fast8_t f1 = UINT_FAST8_MAX; +uint_fast16_t f2 = UINT_FAST16_MAX; +uint_fast32_t f3 = UINT_FAST32_MAX; +uint_fast64_t f4 = UINT_FAST64_MAX; +#ifdef INTPTR_MAX +intptr_t g = INTPTR_MAX; +#endif +#ifdef UINTPTR_MAX +uintptr_t h = UINTPTR_MAX; +#endif +intmax_t i = INTMAX_MAX; +uintmax_t j = UINTMAX_MAX; +struct s { + int a: PTRDIFF_MIN < 0 && 0 < PTRDIFF_MAX ? 1 : -1; + int b: SIG_ATOMIC_MIN <= 0 && 0 < SIG_ATOMIC_MAX ? 1 : -1; + int c: 0 < SIZE_MAX ? 1 : -1; + int d: WCHAR_MIN <= 0 && 0 < WCHAR_MAX ? 1 : -1; + int e: WINT_MIN <= 0 && 0 < WINT_MAX ? 1 : -1; + /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */ + int f: (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1; + int g: (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1; + + /* Detect bugs in OpenBSD 3.9 stdint.h. */ +#ifdef UINT8_MAX + int uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1; +#endif +#ifdef UINT16_MAX + int uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1; +#endif +#ifdef UINT32_MAX + int uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1; +#endif +#ifdef UINT64_MAX + int uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1; +#endif + int uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1; + int uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1; + int uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1; + int uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1; + int uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1; + int uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1; + int uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1; + int uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1; + int uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1; + int uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1; + int size: (size_t) -1 == SIZE_MAX ? 1 : -1; +}; + ]])], + [gl_cv_header_working_stdint_h=yes])]) + fi + if test "$gl_cv_header_working_stdint_h" != yes; then + + dnl Check for <sys/inttypes.h>, and for + dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5). + AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + else + HAVE_SYS_INTTYPES_H=0 + fi + AC_SUBST([HAVE_SYS_INTTYPES_H]) + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + else + HAVE_SYS_BITYPES_H=0 + fi + AC_SUBST([HAVE_SYS_BITYPES_H]) + + gl_STDINT_TYPE_PROPERTIES + STDINT_H=stdint.h + fi + AC_SUBST(STDINT_H) +]) + +dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) +dnl Determine the size of each of the given types in bits. +AC_DEFUN([gl_STDINT_BITSIZEOF], +[ + dnl Use a shell loop, to avoid bloating configure, and + dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into + dnl config.h.in, + dnl - extra AC_SUBST calls, so that the right substitutions are made. + AC_FOREACH([gltype], [$1], + [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), + [Define to the number of bits in type ']gltype['.])]) + for gltype in $1 ; do + AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}], + [_AC_COMPUTE_INT([sizeof ($gltype) * CHAR_BIT], result, + [$2 +#include <limits.h>], [result=unknown]) + eval gl_cv_bitsizeof_${gltype}=\$result + ]) + eval result=\$gl_cv_bitsizeof_${gltype} + if test $result = unknown; then + dnl Use a nonempty default, because some compilers, such as IRIX 5 cc, + dnl do a syntax check even on unused #if conditions and give an error + dnl on valid C code like this: + dnl #if 0 + dnl # if > 32 + dnl # endif + dnl #endif + result=0 + fi + GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result]) + eval BITSIZEOF_${GLTYPE}=\$result + done + AC_FOREACH([gltype], [$1], + [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) +]) + +dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES) +dnl Determine the signedness of each of the given types. +dnl Define HAVE_SIGNED_TYPE if type is signed. +AC_DEFUN([gl_CHECK_TYPES_SIGNED], +[ + dnl Use a shell loop, to avoid bloating configure, and + dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into + dnl config.h.in, + dnl - extra AC_SUBST calls, so that the right substitutions are made. + AC_FOREACH([gltype], [$1], + [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), + [Define to 1 if ']gltype[' is a signed integer type.])]) + for gltype in $1 ; do + AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([$2[ + int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])], + result=yes, result=no) + eval gl_cv_type_${gltype}_signed=\$result + ]) + eval result=\$gl_cv_type_${gltype}_signed + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + if test "$result" = yes; then + AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], 1) + eval HAVE_SIGNED_${GLTYPE}=1 + else + eval HAVE_SIGNED_${GLTYPE}=0 + fi + done + AC_FOREACH([gltype], [$1], + [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) +]) + +dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES) +dnl Determine the suffix to use for integer constants of the given types. +dnl Define t_SUFFIX for each such type. +AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], +[ + dnl Use a shell loop, to avoid bloating configure, and + dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into + dnl config.h.in, + dnl - extra AC_SUBST calls, so that the right substitutions are made. + AC_FOREACH([gltype], [$1], + [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX], + [Define to l, ll, u, ul, ull, etc., as suitable for + constants of type ']gltype['.])]) + for gltype in $1 ; do + AC_CACHE_CHECK([for $gltype integer literal suffix], + [gl_cv_type_${gltype}_suffix], + [eval gl_cv_type_${gltype}_suffix=no + eval result=\$gl_cv_type_${gltype}_signed + if test "$result" = yes; then + glsufu= + else + glsufu=u + fi + for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do + case $glsuf in + '') gltype1='int';; + l) gltype1='long int';; + ll) gltype1='long long int';; + i64) gltype1='__int64';; + u) gltype1='unsigned int';; + ul) gltype1='unsigned long int';; + ull) gltype1='unsigned long long int';; + ui64)gltype1='unsigned __int64';; + esac + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([$2 + extern $gltype foo; + extern $gltype1 foo;])], + [eval gl_cv_type_${gltype}_suffix=\$glsuf]) + eval test \"\$gl_cv_type_${gltype}_suffix\" != no && break + done]) + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" = no && result= + eval ${GLTYPE}_SUFFIX=\$result + AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], $result) + done + AC_FOREACH([gltype], [$1], + [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) +]) + +dnl gl_STDINT_INCLUDES +AC_DEFUN([gl_STDINT_INCLUDES], +[[ + #include <stddef.h> + #include <signal.h> + #if HAVE_WCHAR_H + /* BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before + <wchar.h>. */ + # include <stdio.h> + # include <time.h> + # include <wchar.h> + #endif +]]) -fi -AC_SUBST(STDINT_H) +dnl gl_STDINT_TYPE_PROPERTIES +dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t +dnl of interest to stdint_.h. +AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], +[ + gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t], + [gl_STDINT_INCLUDES]) + gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t], + [gl_STDINT_INCLUDES]) + gl_cv_type_ptrdiff_t_signed=yes + gl_cv_type_size_t_signed=no + gl_INTEGER_TYPE_SUFFIX([ptrdiff_t sig_atomic_t size_t wchar_t wint_t], + [gl_STDINT_INCLUDES]) ]) diff --git a/m4/ulonglong.m4 b/m4/ulonglong.m4 index dee10ccc3..15fab9f46 100644 --- a/m4/ulonglong.m4 +++ b/m4/ulonglong.m4 @@ -1,21 +1,41 @@ -# ulonglong.m4 serial 4 -dnl Copyright (C) 1999-2004 Free Software Foundation, Inc. +# ulonglong.m4 serial 5 +dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Paul Eggert. -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. +# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. +# This fixes a bug in Autoconf 2.60, but can be removed once we +# assume 2.61 everywhere. +AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], +[ + AC_CACHE_CHECK([for unsigned long long int], + [ac_cv_type_unsigned_long_long_int], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[unsigned long long int ull = 18446744073709551615ULL; + typedef int a[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63;]], + [[unsigned long long int ullmax = 18446744073709551615ull; + return (ull << 63 | ull >> 63 | ull << i | ull >> i + | ullmax / ull | ullmax % ull);]])], + [ac_cv_type_unsigned_long_long_int=yes], + [ac_cv_type_unsigned_long_long_int=no])]) + if test $ac_cv_type_unsigned_long_long_int = yes; then + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, + [Define to 1 if the system has the type `unsigned long long int'.]) + fi +]) + +# This macro is obsolescent and should go away soon. AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG], [ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) + AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) + ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int if test $ac_cv_type_unsigned_long_long = yes; then AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, [Define if you have the 'unsigned long long' type.]) |