From b9031386bfe80cb42091cf173d6e2f29c761df65 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Feb 2009 16:49:01 +0100 Subject: [PATCH] Use 'defined _LP64'. --- ChangeLog | 10 +++++++++- lib/inttypes.in.h | 10 +++++----- lib/stdint.in.h | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9946a0c71..9791df77d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-02-27 Bruno Haible + + * lib/inttypes.in.h: Test merely whether _LP64 is defined, not its + value. + * lib/stdint.in.h: Likewise. + Suggested by Eric Blake. Reported by Peter Bray . + + 2009-02-27 Eric Blake doc: mention more functions added in cygwin 1.7.0 @@ -50,7 +58,7 @@ See http://lists.gnu.org/archive/html/bug-gnulib/2009-02/msg00190.html. 2009-02-26 Eric Blake - Bruno Haible + Bruno Haible Work around a *printf bug with %ls on Solaris. * m4/printf.m4 (gl_PRINTF_DIRECTIVE_LS): Also test whether, when a diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 33cec2d25..7022ebc35 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2008 Free Software Foundation, Inc. +/* Copyright (C) 2006-2009 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -168,7 +168,7 @@ # endif # endif # ifdef INT64_MAX -# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @INT64_MAX_EQ_LONG_MAX@) +# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _PRI64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRI64_PREFIX "I64" @@ -185,7 +185,7 @@ # endif # endif # ifdef UINT64_MAX -# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) +# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _PRIu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRIu64_PREFIX "I64" @@ -661,7 +661,7 @@ # endif # endif # ifdef INT64_MAX -# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @INT64_MAX_EQ_LONG_MAX@) +# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _SCN64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCN64_PREFIX "I64" @@ -678,7 +678,7 @@ # endif # endif # ifdef UINT64_MAX -# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) +# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _SCNu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCNu64_PREFIX "I64" diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 469a599ae..869bd3a7f 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -435,7 +435,7 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - #undef PTRDIFF_MIN #undef PTRDIFF_MAX #if @APPLE_UNIVERSAL_BUILD@ -# if _LP64 +# ifdef _LP64 # define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) # define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) # else @@ -463,7 +463,7 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - /* size_t limit */ #undef SIZE_MAX #if @APPLE_UNIVERSAL_BUILD@ -# if _LP64 +# ifdef _LP64 # define SIZE_MAX _STDINT_MAX (0, 64, 0ul) # else # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) -- 2.11.0