[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/m4 ChangeLog longlong.m4 stdint.m4 ulonglo...
|
From: |
Derek Robert Price |
|
Subject: |
[Cvs-cvs] ccvs/m4 ChangeLog longlong.m4 stdint.m4 ulonglo... |
|
Date: |
Mon, 03 Jul 2006 02:12:35 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Derek Robert Price <dprice> 06/07/03 02:12:35
Modified files:
m4 : ChangeLog longlong.m4 stdint.m4 ulonglong.m4
wcwidth.m4
Log message:
* longlong.m4, stdint.m4, ulonglong.m4, wcwidth.m4: Update from GNULIB.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.179&r2=1.180
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/longlong.m4?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/stdint.m4?cvsroot=cvs&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ulonglong.m4?cvsroot=cvs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/wcwidth.m4?cvsroot=cvs&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- ChangeLog 1 Jul 2006 12:58:08 -0000 1.179
+++ ChangeLog 3 Jul 2006 02:12:34 -0000 1.180
@@ -1,3 +1,7 @@
+2006-07-02 Derek Price <address@hidden>
+
+ * longlong.m4, stdint.m4, ulonglong.m4, wcwidth.m4: Update from GNULIB.
+
2006-07-01 Derek Price <address@hidden>
* sys_stat_h.m4: Update from GNULIB.
Index: longlong.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/longlong.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- longlong.m4 1 Mar 2005 18:15:07 -0000 1.3
+++ longlong.m4 3 Jul 2006 02:12:35 -0000 1.4
@@ -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.])
Index: stdint.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/stdint.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- stdint.m4 27 Jun 2006 16:38:04 -0000 1.11
+++ stdint.m4 3 Jul 2006 02:12:35 -0000 1.12
@@ -1,14 +1,25 @@
-# stdint.m4 serial 11
+# stdint.m4 serial 13
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],
[
+ 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_LONG_INT=0
+ fi
+ 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
@@ -18,12 +29,28 @@
fi
AC_SUBST([HAVE_WCHAR_H])
- dnl Check for <stdint.h> that doesn't clash with <sys/types.h>.
- gl_HEADER_STDINT_H
- if test $gl_cv_header_stdint_h = yes; then
- ac_cv_header_stdint_h=yes; dnl Hack for gl_FULL_HEADER_PATH.
+ 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'>'
+ FULL_PATH_STDINT_H="<$gl_cv_full_path_stdint_h>"
AC_SUBST([FULL_PATH_STDINT_H])
HAVE_STDINT_H=1
else
@@ -31,30 +58,121 @@
fi
AC_SUBST([HAVE_STDINT_H])
- dnl Check for <inttypes.h> that doesn't clash with <sys/types.h>.
- gl_HEADER_INTTYPES_H
- if test $gl_cv_header_inttypes_h = yes; then
- ac_cv_header_inttypes_h=yes; dnl Hack for gl_FULL_HEADER_PATH.
- gl_FULL_HEADER_PATH([inttypes.h])
- FULL_PATH_INTTYPES_H='<'$gl_cv_full_path_inttypes_h'>'
- AC_SUBST([FULL_PATH_INTTYPES_H])
- HAVE_INTTYPES_H=1
- else
- HAVE_INTTYPES_H=0
+ 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 check_PTRDIFF: PTRDIFF_MIN < 0 && 0 < PTRDIFF_MAX ? 1 : -1;
+ int check_SIG_ATOMIC: SIG_ATOMIC_MIN <= 0 && 0 < SIG_ATOMIC_MAX ? 1 : -1;
+ int check_SIZE: 0 < SIZE_MAX ? 1 : -1;
+ int check_WCHAR: WCHAR_MIN <= 0 && 0 < WCHAR_MAX ? 1 : -1;
+ int check_WINT: WINT_MIN <= 0 && 0 < WINT_MAX ? 1 : -1;
+
+ /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others. */
+ int check_UINT8_C:
+ (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
+ int check_UINT16_C:
+ (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
+
+ /* Detect bugs in OpenBSD 3.9 stdint.h. */
+#ifdef UINT8_MAX
+ int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
+#endif
+#ifdef UINT16_MAX
+ int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
+#endif
+#ifdef UINT32_MAX
+ int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
+#endif
+#ifdef UINT64_MAX
+ int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
+#endif
+ int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
+ int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
+ int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
+ int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
+ int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
+ int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
+ int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
+ int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
+ int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
+ int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
+ int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
+};
+ ]])],
+ [gl_cv_header_working_stdint_h=yes])])
fi
- AC_SUBST([HAVE_INTTYPES_H])
+ if test "$gl_cv_header_working_stdint_h" != yes; then
- dnl Check for <sys/inttypes.h>.
- AC_CHECK_HEADERS([sys/inttypes.h])
+ 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])
-
- dnl Check for <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
- AC_CHECK_HEADERS([sys/bitypes.h])
if test $ac_cv_header_sys_bitypes_h = yes; then
HAVE_SYS_BITYPES_H=1
else
@@ -62,538 +180,12 @@
fi
AC_SUBST([HAVE_SYS_BITYPES_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
- else
- HAVE_LONG_64BIT=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
- else
- HAVE_LONG_LONG_64BIT=0
- fi
- AC_SUBST(HAVE_LONG_LONG_64BIT)
-
- dnl Here we use FULL_PATH_INTTYPES_H and FULL_PATH_STDINT_H, not just
- dnl <inttypes.h> and <stdint.h>, so that it also works during a
- dnl "config.status --recheck" if an inttypes.h or stdint.h have been
- dnl created in the build directory.
- other_includes='
-/* Get those types that are already defined in other system include files. */
-#if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
-# include <sys/inttypes.h>
-#endif
-#if defined(__OpenBSD__) || defined(__bsdi__) || defined(__sgi)
-# include <sys/types.h>
-# if HAVE_INTTYPES_H
-# include FULL_PATH_INTTYPES_H
-# endif
-#endif
-#if defined(__linux__) && HAVE_SYS_BITYPES_H
-# include <sys/bitypes.h>
-#endif
-#if defined(__sun) && HAVE_SYS_INTTYPES_H
-# include <sys/inttypes.h>
-#endif
-#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H
-# include FULL_PATH_INTTYPES_H
-#endif
-#if HAVE_STDINT_H && !(defined(__sgi) && HAVE_INTTYPES_H && !defined(__c99))
-# include FULL_PATH_STDINT_H
-#endif
-'
- gl_STDINT_CHECK_TYPES(
- [int8_t int16_t int32_t int64_t \
- uint8_t uint16_t uint32_t uint64_t \
- int_least8_t int_least16_t int_least32_t int_least64_t \
- uint_least8_t uint_least16_t uint_least32_t uint_least64_t \
- int_fast8_t int_fast16_t int_fast32_t int_fast64_t \
- uint_fast8_t uint_fast16_t uint_fast32_t uint_fast64_t \
- intptr_t uintptr_t \
- intmax_t uintmax_t],
- [$other_includes],
- [gl_cv_type_], [], [])
-
- dnl Now see if we need a substitute <stdint.h>.
- gl_cv_header_working_stdint_h=no
- if test $gl_cv_header_stdint_h = yes; then
- gl_STDINT_CHECK_TYPES(
- [int64_t uint64_t \
- int_least64_t uint_least64_t \
- int_fast64_t uint_fast64_t],
- [#include <stdint.h>],
- [gl_cv_stdint_], [_IN_STDINT_H], [in <stdint.h>])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#include <stdint.h>
-int8_t a1 = INT8_C (17);
-int16_t a2 = INT16_C (17);
-int32_t a3 = INT32_C (17);
-#if HAVE_INT64_T_IN_STDINT_H
-int64_t a4 = INT64_C (17);
-#endif
-uint8_t b1 = UINT8_C (17);
-uint16_t b2 = UINT16_C (17);
-uint32_t b3 = UINT32_C (17);
-#if HAVE_UINT64_T_IN_STDINT_H
-uint64_t b4 = UINT64_C (17);
-#endif
-int_least8_t c1 = 17;
-int_least16_t c2 = 17;
-int_least32_t c3 = 17;
-#if HAVE_INT_LEAST64_T_IN_STDINT_H
-int_least64_t c4 = 17;
-#endif
-uint_least8_t d1 = 17;
-uint_least16_t d2 = 17;
-uint_least32_t d3 = 17;
-#if HAVE_UINT_LEAST64_T_IN_STDINT_H
-uint_least64_t d4 = 17;
-#endif
-int_fast8_t e1 = 17;
-int_fast16_t e2 = 17;
-int_fast32_t e3 = 17;
-#if HAVE_INT_FAST64_T_IN_STDINT_H
-int_fast64_t e4 = 17;
-#endif
-uint_fast8_t f1 = 17;
-uint_fast16_t f2 = 17;
-uint_fast32_t f3 = 17;
-#if HAVE_UINT_FAST64_T_IN_STDINT_H
-uint_fast64_t f4 = 17;
-#endif
-intptr_t g = 17;
-uintptr_t h = 17;
-intmax_t i = INTMAX_C (17);
-uintmax_t j = UINTMAX_C (17);
- ])],
- [gl_cv_header_working_stdint_h=yes])
- fi
- if test $gl_cv_header_working_stdint_h = yes; then
- dnl Use the existing <stdint.h>, adding missing macro definitions.
- suff64=
- suffu64=
- if test $HAVE_LONG_64BIT = 1; then
- suff64=L
- suffu64=UL
- else
- if test $HAVE_LONG_LONG_64BIT = 1; then
- suff64=LL
- suffu64=ULL
- else
- AC_EGREP_CPP([msvc compiler], [
-#ifdef _MSC_VER
-msvc compiler
-#endif
- ], [
- suff64=i64
- suffu64=ui64
- ])
- fi
- fi
- dnl Here we assume a standard architecture where the hardware integer
- dnl types have 8, 16, 32, optionally 64 bits.
- gl_STDINT_MISSING_BOUND([INT8_MIN], [-128],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT8_MAX], [127],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT8_MAX], [255],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT16_MIN], [-32768],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT16_MAX], [32767],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT16_MAX], [65535],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT32_MIN], [(~INT32_MAX)],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT32_MAX], [2147483647],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT32_MAX], [4294967295U],
- [Define if <stdint.h> doesn't define it.])
- if test $gl_cv_stdint_int64_t = yes; then
- gl_STDINT_MISSING_BOUND([INT64_MIN], [(~INT64_MAX)],
- [Define if <stdint.h> doesn't define it but has the int64_t type.])
- gl_STDINT_MISSING_BOUND([INT64_MAX], [9223372036854775807${suff64}],
- [Define if <stdint.h> doesn't define it but has the int64_t type.])
- fi
- if test $gl_cv_stdint_uint64_t = yes; then
- gl_STDINT_MISSING_BOUND([UINT64_MAX], [18446744073709551615${suffu64}],
- [Define if <stdint.h> doesn't define it but has the uint64_t type.])
- fi
- dnl Here we assume a standard architecture where the hardware integer
- dnl types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
- dnl are the same as the corresponding N_t types.
- gl_STDINT_MISSING_BOUND([INT_LEAST8_MIN], [INT8_MIN],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT_LEAST8_MAX], [INT8_MAX],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT_LEAST8_MAX], [UINT8_MAX],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT_LEAST16_MIN], [INT16_MIN],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT_LEAST16_MAX], [INT16_MAX],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT_LEAST16_MAX], [UINT16_MAX],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT_LEAST32_MIN], [INT32_MIN],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([INT_LEAST32_MAX], [INT32_MAX],
- [Define if <stdint.h> doesn't define it.])
- gl_STDINT_MISSING_BOUND([UINT_LEAST32_MAX], [UINT32_MAX],
- [Define if <stdint.h> doesn't define it.])
- if test $gl_cv_stdint_int_least64_t = yes; then
- gl_STDINT_MISSING_BOUND([INT_LEAST64_MIN], [INT64_MIN],
- [Define if <stdint.h> doesn't define it but has the int_least64_t
type.])
- gl_STDINT_MISSING_BOUND([INT_LEAST64_MAX], [INT64_MAX],
- [Define if <stdint.h> doesn't define it but has the int_least64_t
type.])
- fi
- if test $gl_cv_stdint_uint_least64_t = yes; then
- gl_STDINT_MISSING_BOUND([UINT_LEAST64_MAX], [UINT64_MAX],
- [Define if <stdint.h> doesn't define it but has the uint_least64_t
type.])
- fi
- dnl Here we assume a standard architecture where the hardware integer
- dnl types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
- dnl are taken from the same list of types.
- gl_STDINT_MISSING_BOUNDS([INT_FAST8_MIN INT_FAST8_MAX UINT_FAST8_MAX \
- INT_FAST16_MIN INT_FAST16_MAX UINT_FAST16_MAX \
- INT_FAST32_MIN INT_FAST32_MAX UINT_FAST32_MAX])
- if test $gl_cv_stdint_uint_fast64_t = yes; then
- gl_STDINT_MISSING_BOUNDS([INT_FAST64_MIN INT_FAST64_MAX])
- fi
- if test $gl_cv_stdint_uint_fast64_t = yes; then
- gl_STDINT_MISSING_BOUNDS([UINT_FAST64_MAX])
- fi
- gl_STDINT_MISSING_BOUNDS([INTPTR_MIN INTPTR_MAX UINTPTR_MAX \
- INTMAX_MIN INTMAX_MAX UINTMAX_MAX])
- gl_STDINT_MISSING_BOUNDS([PTRDIFF_MIN PTRDIFF_MAX], [#include <stddef.h>])
- gl_SIZE_MAX
- gl_STDINT_MISSING_BOUNDS2([SIG_ATOMIC_MIN SIG_ATOMIC_MAX],
- [#include <signal.h>])
- dnl Don't bother defining WCHAR_MIN and WCHAR_MAX, since they should
- dnl already be defined in <stddef.h> or <wchar.h>.
- dnl For wint_t we need <wchar.h>.
- dnl Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included
- dnl before <wchar.h>.
- dnl BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
- dnl <wchar.h>.
- gl_STDINT_MISSING_BOUNDS2([WINT_MIN WINT_MAX], [
-#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- STDINT_H=''
- else
-
- gl_STDINT_BITSIZEOF(
- [int8_t int16_t int32_t int64_t \
- uint8_t uint16_t uint32_t uint64_t \
- int_least8_t int_least16_t int_least32_t int_least64_t \
- uint_least8_t uint_least16_t uint_least32_t uint_least64_t \
- int_fast8_t int_fast16_t int_fast32_t int_fast64_t \
- uint_fast8_t uint_fast16_t uint_fast32_t uint_fast64_t \
- intptr_t uintptr_t \
- intmax_t uintmax_t],
- [$other_includes])
-
- gl_cv_type_unsigned_int=yes
- gl_cv_type_long=yes
- gl_cv_type_unsigned_long=yes
- gl_STDINT_BITSIZEOF([unsigned_int long unsigned_long],
- [typedef unsigned int unsigned_int;
- typedef unsigned long unsigned_long;])
-
- AC_CHECK_TYPES([ptrdiff_t])
- gl_cv_type_ptrdiff_t=$ac_cv_type_ptrdiff_t
- AC_REQUIRE([AC_TYPE_SIZE_T])
- gl_cv_type_size_t=yes
- gl_STDINT_BITSIZEOF([ptrdiff_t size_t], [#include <stddef.h>])
- gl_CHECK_TYPE_SAME([ptrdiff_t], [long], [#include <stddef.h>])
- gl_CHECK_TYPE_SAME([size_t], [unsigned long], [#include <stddef.h>])
-
- AC_CHECK_TYPES([sig_atomic_t], , , [#include <signal.h>])
- gl_cv_type_sig_atomic_t=$ac_cv_type_sig_atomic_t
- gl_STDINT_BITSIZEOF([sig_atomic_t], [#include <signal.h>])
- gl_CHECK_TYPES_SIGNED([sig_atomic_t], [#include <signal.h>])
- if test $HAVE_SIGNED_SIG_ATOMIC_T = 1; then
- gl_CHECK_TYPE_SAME([sig_atomic_t], [long], [#include <signal.h>])
- else
- gl_CHECK_TYPE_SAME([sig_atomic_t], [unsigned long], [#include
<signal.h>])
- fi
-
- AC_REQUIRE([gt_TYPE_WCHAR_T])
- gl_cv_type_wchar_t=$gt_cv_c_wchar_t
- gl_STDINT_BITSIZEOF([wchar_t], [#include <stddef.h>])
- gl_CHECK_TYPES_SIGNED([wchar_t], [#include <stddef.h>])
- if test $HAVE_SIGNED_WCHAR_T = 1; then
- gl_CHECK_TYPE_SAME([wchar_t], [long], [#include <stddef.h>])
- else
- gl_CHECK_TYPE_SAME([wchar_t], [unsigned long], [#include <stddef.h>])
- fi
-
- dnl For wint_t we need <wchar.h>.
- dnl Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included
- dnl before <wchar.h>.
- dnl BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
- dnl <wchar.h>.
- AC_CHECK_TYPES([wint_t], , , [#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- gl_cv_type_wint_t=$ac_cv_type_wint_t
- gl_STDINT_BITSIZEOF([wint_t], [#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- gl_CHECK_TYPES_SIGNED([wint_t], [#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- if test $HAVE_SIGNED_WINT_T = 1; then
- gl_CHECK_TYPE_SAME([wint_t], [long], [#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- else
- gl_CHECK_TYPE_SAME([wint_t], [unsigned long], [#include <stdio.h>
-#include <time.h>
-#include <wchar.h>
-])
- fi
-
- STDINT_H='stdint.h'
+ gl_STDINT_TYPE_PROPERTIES
+ STDINT_H=stdint.h
fi
AC_SUBST(STDINT_H)
])
-dnl Set gl_cv_header_stdint_h to yes and define HAVE_STDINT_H if
-dnl <stdint.h> exists and doesn't clash with <sys/types.h>.
-AC_DEFUN([gl_HEADER_STDINT_H],
-[
- dnl Check for <stdint.h> that doesn't clash with <sys/types.h>.
- AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, [
- AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <stdint.h>],
- [], gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)
- ])
- if test $gl_cv_header_stdint_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_STDINT_H, 1,
- [Define if <stdint.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
-
-dnl Set gl_cv_header_inttypes_h to yes and define HAVE_INTTYPES_H if
-dnl <inttypes.h> exists and doesn't clash with <sys/types.h>.
-AC_DEFUN([gl_HEADER_INTTYPES_H],
-[
- dnl Check for <inttypes.h> that doesn't clash with <sys/types.h>.
- dnl On IRIX 5.3, <inttypes.h> conflicts with <sys/types.h>.
- AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, [
- AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <inttypes.h>],
- [], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)
- ])
- if test $gl_cv_header_inttypes_h = yes; then
- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
- [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
- fi
-])
-
-dnl gl_STDINT_CHECK_TYPES(TYPES, INCLUDES, CACHE_VAR_PREFIX, MACRO_SUFFIX,
DESCRIPTION_SUFFIX)
-dnl Check each of the given types, whether they are defined in the given
-dnl include files.
-AC_DEFUN([gl_STDINT_CHECK_TYPES],
-[
- 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_]translit(gltype,[abcdefghijklmnopqrstuvwxyz],[ABCDEFGHIJKLMNOPQRSTUVWXYZ])[$4],
- [Define to 1 if the type ']gltype[' is already defined$5.])])
- for gltype in $1 ; do
- AC_MSG_CHECKING([for $gltype])
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([$2
-/* Test if the type exists. */
-$gltype x = 17;
- ])],
- result=yes, result=no)
- eval $3${gltype}=\$result
- AC_MSG_RESULT($result)
- GLTYPE=`echo "$gltype" | tr abcdefghijklmnopqrstuvwxyz
ABCDEFGHIJKLMNOPQRSTUVWXYZ`
- if test $result = yes; then
- AC_DEFINE_UNQUOTED([HAVE_${GLTYPE}$4], 1)
- eval HAVE_${GLTYPE}$4=1
- else
- eval HAVE_${GLTYPE}$4=0
- fi
- done
- AC_FOREACH([gltype], [$1],
-
[AC_SUBST([HAVE_]translit(gltype,[abcdefghijklmnopqrstuvwxyz],[ABCDEFGHIJKLMNOPQRSTUVWXYZ])[$4])])
-])
-
-dnl gl_STDINT_MISSING_BOUND(TYPE_BOUND, DEFAULT, DESCRIPTION)
-dnl assumes an otherwise complete <stdint.h> and defines TYPE_BOUND if
-dnl <stdint.h> doesn't define it.
-AC_DEFUN([gl_STDINT_MISSING_BOUND],
-[
- AC_CACHE_CHECK([for $1], [gl_cv_stdint_$1],
- [AC_EGREP_CPP([found it], [#include <stdint.h>
-#ifdef $1
-found it
-#endif
- ], [gl_cv_stdint_$1=yes], [gl_cv_stdint_$1="$2"])])
- if test "$gl_cv_stdint_$1" != yes; then
- AC_DEFINE_UNQUOTED([$1], [$2], [$3])
- fi
-])
-
-dnl gl_STDINT_MISSING_BOUNDS(BOUNDS, INCLUDES)
-dnl assumes an otherwise complete <stdint.h> and defines each element of BOUNDS
-dnl if <stdint.h> doesn't define it.
-dnl Use this for types whose signedness is determined by the first letter
-dnl ('u' or not).
-AC_DEFUN([gl_STDINT_MISSING_BOUNDS],
-[
- 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.
- AC_FOREACH([bound], [$1],
- [AH_TEMPLATE(bound, [Define if <stdint.h> doesn't define it.])])
-changequote(,)dnl
- sed_unsigned='s,^\(U*\).*,\1,'
- sed_limitkind='s,^.*\(_[^_]*\)$,\1,'
-changequote([,])dnl
- for bound in $1; do
- type=`echo $bound | sed -e 's,_MAX,_t,' -e 's,_MIN,_t,' | tr
ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
- unsigned=`echo $bound | sed -e "$sed_unsigned" | tr U u`
- width=`echo $bound | sed -e 's,^U*INT,,' -e 's,_MIN,,' -e 's,_MAX,,'`
- limitkind=`echo $bound | sed -e "$sed_limitkind"`
- AC_CACHE_CHECK([for $bound], [gl_cv_stdint_$bound],
- [AC_EGREP_CPP([found it], [#include <stdint.h>
-#ifdef $bound
-found it
-#endif
- ], [eval gl_cv_stdint_$bound=yes],
- [result=
- case $width in
- *8) widthlist="8 16 32 64" ;;
- *16) widthlist="16 32 64" ;;
- *32 | PTR | MAX | PTRDIFF) widthlist="32 64" ;;
- *64) widthlist="64" ;;
- esac
- for w in $widthlist; do
- if test -z "$result"; then
- AC_COMPILE_IFELSE([[$2
-#include <stdint.h>
-int verify[2 * (sizeof ($type) == sizeof (${unsigned}int${w}_t)) - 1];
- ]], [result=`echo "$unsigned" | tr u U`INT${w}${limitkind}])
- else
- break
- fi
- done
- if test -z "$result"; then
- result=no
- fi
- eval gl_cv_stdint_$bound=\$result
- ])])
- eval result=\$gl_cv_stdint_$bound
- if test "$result" != yes && test "$result" != no; then
- AC_DEFINE_UNQUOTED([$bound], [$result],
- [Define if <stdint.h> doesn't define it.])
- fi
- done
-])
-
-dnl gl_STDINT_MISSING_BOUNDS2(BOUNDS, INCLUDES)
-dnl assumes an otherwise complete <stdint.h> and defines each element of BOUNDS
-dnl if <stdint.h> doesn't define it.
-dnl Use this for types whose signedness is a priori unknown.
-AC_DEFUN([gl_STDINT_MISSING_BOUNDS2],
-[
- 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.
- AC_FOREACH([bound], [$1],
- [AH_TEMPLATE(bound, [Define if <stdint.h> doesn't define it.])])
-changequote(,)dnl
- sed_limitkind='s,^.*\(_[^_]*\)$,\1,'
-changequote([,])dnl
- for bound in $1; do
- type=`echo $bound | sed -e 's,_MAX,_t,' -e 's,_MIN,_t,' | tr
ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
- limitkind=`echo $bound | sed -e "$sed_limitkind"`
- AC_CACHE_CHECK([for $bound], [gl_cv_stdint_$bound],
- [AC_EGREP_CPP([found it], [#include <stdint.h>
-#ifdef $bound
-found it
-#endif
- ], [eval gl_cv_stdint_$bound=yes],
- [result=
- AC_COMPILE_IFELSE([[$2
- int verify[2 * (($type) -1 >= ($type) 0) - 1];
- ]],
- [eval gl_cv_${type}_signed=no],
- [eval gl_cv_${type}_signed=yes])
- if eval test \$gl_cv_${type}_signed = yes; then
- for w in 8 16 32 64; do
- if test -z "$result"; then
- AC_COMPILE_IFELSE([[$2
-#include <stdint.h>
-int verify[2 * (sizeof ($type) == sizeof (int${w}_t)) - 1];
- ]], [result=INT${w}${limitkind}])
- else
- break
- fi
- done
- else
- if test ${limitkind} = _MIN; then
- result=0
- else
- for w in 8 16 32 64; do
- if test -z "$result"; then
- AC_COMPILE_IFELSE([[$2
-#include <stdint.h>
-int verify[2 * (sizeof ($type) == sizeof (uint${w}_t)) - 1];
- ]], [result=UINT${w}${limitkind}])
- else
- break
- fi
- done
- fi
- fi
- if test -z "$result"; then
- result=no
- fi
- eval gl_cv_stdint_$bound=\$result
- ])])
- eval result=\$gl_cv_stdint_$bound
- if test "$result" != yes && test "$result" != no; then
- AC_DEFINE_UNQUOTED([$bound], [$result],
- [Define if <stdint.h> doesn't define it.])
- fi
- done
-])
-
dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
dnl Determine the size of each of the given types in bits.
AC_DEFUN([gl_STDINT_BITSIZEOF],
@@ -606,15 +198,14 @@
[AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz
],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
[Define to the number of bits in type ']gltype['.])])
for gltype in $1 ; do
- if eval test \$gl_cv_type_${gltype} = yes; then
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)
+#include <limits.h>], [result=unknown])
eval gl_cv_bitsizeof_${gltype}=\$result
])
eval result=\$gl_cv_bitsizeof_${gltype}
- else
+ 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:
@@ -647,9 +238,8 @@
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 * (($1) -1 < ($1) 0) - 1];
- ]])],
+ [AC_LANG_PROGRAM([$2[
+ int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
result=yes, result=no)
eval gl_cv_type_${gltype}_signed=\$result
])
@@ -666,14 +256,82 @@
[AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz
],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
])
-dnl gl_CHECK_TYPE_SAME(TYPE, KNOWNTYPE, INCLUDES)
-dnl Determines whether two types are the same.
-AC_DEFUN([gl_CHECK_TYPE_SAME],
+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
+]])
+
+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],
[
- AC_TRY_COMPILE([$3
- extern $1 foo;
- extern $2 foo;], [],
- [SAME_TYPE_]AS_TR_CPP([$1])[_]AS_TR_CPP([$2])[=1],
- [SAME_TYPE_]AS_TR_CPP([$1])[_]AS_TR_CPP([$2])[=0])
- AC_SUBST([SAME_TYPE_]AS_TR_CPP([$1])[_]AS_TR_CPP([$2]))
+ 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])
])
Index: ulonglong.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ulonglong.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ulonglong.m4 1 Mar 2005 18:15:07 -0000 1.3
+++ ulonglong.m4 3 Jul 2006 02:12:35 -0000 1.4
@@ -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.])
Index: wcwidth.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/wcwidth.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- wcwidth.m4 29 Jun 2006 12:12:34 -0000 1.1
+++ wcwidth.m4 3 Jul 2006 02:12:35 -0000 1.2
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 2
+# wcwidth.m4 serial 3
dnl Copyright (C) 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,
@@ -15,8 +15,7 @@
AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
AC_CHECK_FUNCS_ONCE([iswprint wcwidth])
- AC_CACHE_CHECK([whether wcwidth is declared], [ac_cv_have_decl_wcwidth],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ AC_CHECK_DECLS([wcwidth], [], [], [
/* AIX 3.2.5 declares wcwidth in <string.h>. */
#if HAVE_STRING_H
# include <string.h>
@@ -24,17 +23,4 @@
#if HAVE_WCHAR_H
# include <wchar.h>
#endif
-], [
-#ifndef wcwidth
- char *p = (char *) wcwidth;
-#endif
-])], [ac_cv_have_decl_wcwidth=yes], [ac_cv_have_decl_wcwidth=no])])
- if test $ac_cv_have_decl_wcwidth = yes; then
- ac_val=1
- else
- ac_val=0
- fi
- AC_DEFINE_UNQUOTED([HAVE_DECL_WCWIDTH], [$ac_val],
- [Define to 1 if you have the declaration of wcwidth(), and to 0
- otherwise.])
-])
+])])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] ccvs/m4 ChangeLog longlong.m4 stdint.m4 ulonglo...,
Derek Robert Price <=