From 040948ed5acbf7ca828012c62e31848bf7ed1e8f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 17 Mar 2005 18:31:09 +0000 Subject: [PATCH] Rename HAVE_LONGLONG_64BIT to HAVE_LONG_LONG_64BIT. --- ChangeLog | 5 +++++ lib/ChangeLog | 4 ++++ lib/stdint_.h | 22 +++++++++++----------- m4/ChangeLog | 5 +++++ m4/stdint.m4 | 10 +++++----- modules/stdint | 2 +- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a576c58be..fc8d697c52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Bruno Haible + + * modules/stdint (Makefile.am): Use HAVE_LONG_LONG_64BIT instead of + HAVE_LONGLONG_64BIT. + 2005-03-04 Derek R. Price * gnulib-tool (func_cp_if_changed, func_mv_if_changed): New functions. diff --git a/lib/ChangeLog b/lib/ChangeLog index a8058e9c5c..5b2626b51e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-03-16 Bruno Haible + + * stdint_.h: Use HAVE_LONG_LONG_64BIT instead of HAVE_LONGLONG_64BIT. + 2005-03-15 Paul Eggert * strftime.c (my_strftime): Prepend space to format so that we can diff --git a/lib/stdint_.h b/lib/stdint_.h index acd06316b3..67640e9387 100644 --- a/lib/stdint_.h +++ b/lib/stdint_.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc. Written by Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -78,7 +78,7 @@ typedef unsigned int uint32_t; typedef long int64_t; #endif typedef unsigned long uint64_t; -#elif @HAVE_LONGLONG_64BIT@ +#elif @HAVE_LONG_LONG_64BIT@ #ifdef NEED_SIGNED_INT_TYPES typedef long long int64_t; #endif @@ -95,7 +95,7 @@ typedef int16_t int_least16_t; typedef uint16_t uint_least16_t; typedef int32_t int_least32_t; typedef uint32_t uint_least32_t; -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ typedef int64_t int_least64_t; typedef uint64_t uint_least64_t; #endif @@ -108,7 +108,7 @@ typedef int32_t int_fast16_t; typedef uint32_t uint_fast16_t; typedef int32_t int_fast32_t; typedef uint32_t uint_fast32_t; -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ typedef int64_t int_fast64_t; typedef uint64_t uint_fast64_t; #endif @@ -126,7 +126,7 @@ typedef unsigned long uintptr_t; /* 7.18.1.5. Greatest-width integer types */ -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ typedef int64_t intmax_t; typedef uint64_t uintmax_t; #else @@ -153,7 +153,7 @@ typedef uint32_t uintmax_t; #define INT64_MIN (~INT64_MIN) #define INT64_MAX 9223372036854775807L #define UINT64_MAX 18446744073709551615UL -#elif @HAVE_LONGLONG_64BIT@ +#elif @HAVE_LONG_LONG_64BIT@ #define INT64_MIN (~INT64_MIN) #define INT64_MAX 9223372036854775807LL #define UINT64_MAX 18446744073709551615ULL @@ -170,7 +170,7 @@ typedef uint32_t uintmax_t; #define INT_LEAST32_MIN INT32_MIN #define INT_LEAST32_MAX INT32_MAX #define UINT_LEAST32_MAX UINT32_MAX -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ #define INT_LEAST64_MIN INT64_MIN #define INT_LEAST64_MAX INT64_MAX #define UINT_LEAST64_MAX UINT64_MAX @@ -187,7 +187,7 @@ typedef uint32_t uintmax_t; #define INT_FAST32_MIN INT32_MIN #define INT_FAST32_MAX INT32_MAX #define UINT_FAST32_MAX UINT32_MAX -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ #define INT_FAST64_MIN INT64_MIN #define INT_FAST64_MAX INT64_MAX #define UINT_FAST64_MAX UINT64_MAX @@ -201,7 +201,7 @@ typedef uint32_t uintmax_t; /* 7.18.2.5. Limits of greatest-width integer types */ -#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@ #define INTMAX_MIN INT64_MIN #define INTMAX_MAX INT64_MAX #define UINTMAX_MAX UINT64_MAX @@ -242,7 +242,7 @@ typedef uint32_t uintmax_t; #if @HAVE_LONG_64BIT@ #define INT64_C(x) x##L #define UINT64_C(x) x##UL -#elif @HAVE_LONGLONG_64BIT@ +#elif @HAVE_LONG_LONG_64BIT@ #define INT64_C(x) x##LL #define UINT64_C(x) x##ULL #endif @@ -252,7 +252,7 @@ typedef uint32_t uintmax_t; #if @HAVE_LONG_64BIT@ #define INTMAX_C(x) x##L #define UINTMAX_C(x) x##UL -#elif @HAVE_LONGLONG_64BIT@ +#elif @HAVE_LONG_LONG_64BIT@ #define INTMAX_C(x) x##LL #define UINTMAX_C(x) x##ULL #else diff --git a/m4/ChangeLog b/m4/ChangeLog index cb4827d727..f35eec5d2d 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Bruno Haible + + * stdint.m4 (gl_STDINT_H): Define HAVE_LONG_LONG_64BIT instead of + HAVE_LONGLONG_64BIT. + 2005-03-14 Bruno Haible * lib-link.m4, gettext.m4, nls.m4, po.m4: diff --git a/m4/stdint.m4 b/m4/stdint.m4 index fe8ac6115a..4875752de8 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 3 -dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. +# stdint.m4 serial 4 +dnl Copyright (C) 2001-2002, 2004-2005 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. @@ -47,11 +47,11 @@ typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; 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_LONGLONG_64BIT=1 + HAVE_LONG_LONG_64BIT=1 else - HAVE_LONGLONG_64BIT=0 + HAVE_LONG_LONG_64BIT=0 fi - AC_SUBST(HAVE_LONGLONG_64BIT) + AC_SUBST(HAVE_LONG_LONG_64BIT) fi AC_SUBST(STDINT_H) diff --git a/modules/stdint b/modules/stdint index e919880f0a..8441aba357 100644 --- a/modules/stdint +++ b/modules/stdint @@ -21,7 +21,7 @@ EXTRA_DIST += stdint_.h # doesn't have one that works with the given compiler. all-local $(lib_OBJECTS): $(STDINT_H) stdint.h: stdint_.h - sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONGLONG_64BIT@/$(HAVE_LONGLONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t + sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONG_LONG_64BIT@/$(HAVE_LONG_LONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t mv $@-t $@ MOSTLYCLEANFILES += stdint.h stdint.h-t -- 2.30.2