bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug-gnulib] stdint update


From: Bruno Haible
Subject: [bug-gnulib] stdint update
Date: Thu, 17 Mar 2005 19:26:31 +0100
User-agent: KMail/1.5

Hi,

Module 'stdint' was using a macro name HAVE_LONGLONG_64BIT that doesn't follow
our naming conventions. I changed it to HAVE_LONG_LONG_64BIT, to be more in
line with longlong.m4 and longdouble.m4.


2005-03-16  Bruno Haible  <address@hidden>

        * m4/stdint.m4 (gl_STDINT_H): Define HAVE_LONG_LONG_64BIT instead of
        HAVE_LONGLONG_64BIT.
        * lib/stdint_.h: Use HAVE_LONG_LONG_64BIT instead of 
HAVE_LONGLONG_64BIT.
        * modules/stdint (Makefile.am): Use HAVE_LONG_LONG_64BIT instead of
        HAVE_LONGLONG_64BIT.

diff -c -3 -r1.2 -r1.3
*** m4/stdint.m4        23 Jan 2005 08:06:57 -0000      1.2
--- m4/stdint.m4        17 Mar 2005 18:31:09 -0000      1.3
***************
*** 1,5 ****
! # stdint.m4 serial 3
! dnl Copyright (C) 2001-2002, 2004 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.
--- 1,5 ----
! # 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,57 ****
  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
    else
!     HAVE_LONGLONG_64BIT=0
    fi
!   AC_SUBST(HAVE_LONGLONG_64BIT)
  
  fi
  AC_SUBST(STDINT_H)
--- 47,57 ----
  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)
  
  fi
  AC_SUBST(STDINT_H)
diff -c -3 -r1.1 -r1.2
*** lib/stdint_.h       8 Sep 2004 12:43:11 -0000       1.1
--- lib/stdint_.h       17 Mar 2005 18:31:11 -0000      1.2
***************
*** 1,4 ****
! /* Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc.
     Written by Bruno Haible, Sam Steingold, Peter Burwood.
     This file is part of gnulib.
  
--- 1,4 ----
! /* 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,84 ****
  typedef long           int64_t;
  #endif
  typedef unsigned long  uint64_t;
! #elif @HAVE_LONGLONG_64BIT@
  #ifdef NEED_SIGNED_INT_TYPES
  typedef long long          int64_t;
  #endif
--- 78,84 ----
  typedef long           int64_t;
  #endif
  typedef unsigned long  uint64_t;
! #elif @HAVE_LONG_LONG_64BIT@
  #ifdef NEED_SIGNED_INT_TYPES
  typedef long long          int64_t;
  #endif
***************
*** 95,101 ****
  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@
  typedef int64_t  int_least64_t;
  typedef uint64_t uint_least64_t;
  #endif
--- 95,101 ----
  typedef uint16_t uint_least16_t;
  typedef int32_t  int_least32_t;
  typedef uint32_t uint_least32_t;
! #if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@
  typedef int64_t  int_least64_t;
  typedef uint64_t uint_least64_t;
  #endif
***************
*** 108,114 ****
  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@
  typedef int64_t  int_fast64_t;
  typedef uint64_t uint_fast64_t;
  #endif
--- 108,114 ----
  typedef uint32_t uint_fast16_t;
  typedef int32_t  int_fast32_t;
  typedef uint32_t uint_fast32_t;
! #if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@
  typedef int64_t  int_fast64_t;
  typedef uint64_t uint_fast64_t;
  #endif
***************
*** 126,132 ****
  
  /* 7.18.1.5. Greatest-width integer types */
  
! #if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
  typedef int64_t  intmax_t;
  typedef uint64_t uintmax_t;
  #else
--- 126,132 ----
  
  /* 7.18.1.5. Greatest-width integer types */
  
! #if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@
  typedef int64_t  intmax_t;
  typedef uint64_t uintmax_t;
  #else
***************
*** 153,159 ****
  #define INT64_MIN   (~INT64_MIN)
  #define INT64_MAX   9223372036854775807L
  #define UINT64_MAX 18446744073709551615UL
! #elif @HAVE_LONGLONG_64BIT@
  #define INT64_MIN   (~INT64_MIN)
  #define INT64_MAX   9223372036854775807LL
  #define UINT64_MAX 18446744073709551615ULL
--- 153,159 ----
  #define INT64_MIN   (~INT64_MIN)
  #define INT64_MAX   9223372036854775807L
  #define UINT64_MAX 18446744073709551615UL
! #elif @HAVE_LONG_LONG_64BIT@
  #define INT64_MIN   (~INT64_MIN)
  #define INT64_MAX   9223372036854775807LL
  #define UINT64_MAX 18446744073709551615ULL
***************
*** 170,176 ****
  #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@
  #define INT_LEAST64_MIN INT64_MIN
  #define INT_LEAST64_MAX INT64_MAX
  #define UINT_LEAST64_MAX UINT64_MAX
--- 170,176 ----
  #define INT_LEAST32_MIN INT32_MIN
  #define INT_LEAST32_MAX INT32_MAX
  #define UINT_LEAST32_MAX UINT32_MAX
! #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,193 ****
  #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@
  #define INT_FAST64_MIN INT64_MIN
  #define INT_FAST64_MAX INT64_MAX
  #define UINT_FAST64_MAX UINT64_MAX
--- 187,193 ----
  #define INT_FAST32_MIN INT32_MIN
  #define INT_FAST32_MAX INT32_MAX
  #define UINT_FAST32_MAX UINT32_MAX
! #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,207 ****
  
  /* 7.18.2.5. Limits of greatest-width integer types */
  
! #if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
  #define INTMAX_MIN INT64_MIN
  #define INTMAX_MAX INT64_MAX
  #define UINTMAX_MAX UINT64_MAX
--- 201,207 ----
  
  /* 7.18.2.5. Limits of greatest-width integer types */
  
! #if @HAVE_LONG_64BIT@ || @HAVE_LONG_LONG_64BIT@
  #define INTMAX_MIN INT64_MIN
  #define INTMAX_MAX INT64_MAX
  #define UINTMAX_MAX UINT64_MAX
***************
*** 242,248 ****
  #if @HAVE_LONG_64BIT@
  #define INT64_C(x) x##L
  #define UINT64_C(x) x##UL
! #elif @HAVE_LONGLONG_64BIT@
  #define INT64_C(x) x##LL
  #define UINT64_C(x) x##ULL
  #endif
--- 242,248 ----
  #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
  #endif
***************
*** 252,258 ****
  #if @HAVE_LONG_64BIT@
  #define INTMAX_C(x) x##L
  #define UINTMAX_C(x) x##UL
! #elif @HAVE_LONGLONG_64BIT@
  #define INTMAX_C(x) x##LL
  #define UINTMAX_C(x) x##ULL
  #else
--- 252,258 ----
  #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
  #else
diff -c -3 -r1.2 -r1.3
*** modules/stdint      22 Sep 2004 15:11:04 -0000      1.2
--- modules/stdint      17 Mar 2005 18:31:11 -0000      1.3
***************
*** 21,27 ****
  # 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 > address@hidden
        mv address@hidden $@
  MOSTLYCLEANFILES += stdint.h stdint.h-t
  
--- 21,27 ----
  # 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_LONG_LONG_64BIT@/$(HAVE_LONG_LONG_64BIT)/g'
 < $(srcdir)/stdint_.h > address@hidden
        mv address@hidden $@
  MOSTLYCLEANFILES += stdint.h stdint.h-t
  





reply via email to

[Prev in Thread] Current Thread [Next in Thread]