X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Finttypes.in.h;h=7022ebc354cb529b862b2faded233cc6e1b970fd;hb=b472b51e158594a679f8e49eea49cf14d1c3be9a;hp=2aaafdb9f02644bc0c8ee629b64344214b3f39bb;hpb=4a016ecd8416290e849d70aeeec398e85c420de8;p=gnulib.git
diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h
index 2aaafdb9f..7022ebc35 100644
--- a/lib/inttypes.in.h
+++ b/lib/inttypes.in.h
@@ -1,11 +1,11 @@
-/* Copyright (C) 2006-2007 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.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/*
* ISO C 99 for platforms that lack it.
@@ -27,6 +26,9 @@
The include_next requires a split double-inclusion guard. */
#if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
# if @HAVE_INTTYPES_H@
+# if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+# endif
# @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
# endif
#endif
@@ -166,7 +168,7 @@
# endif
# endif
# ifdef INT64_MAX
-# if INT64_MAX == 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"
@@ -183,7 +185,7 @@
# endif
# endif
# ifdef UINT64_MAX
-# if UINT64_MAX == 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"
@@ -484,7 +486,7 @@
# if !defined PRIdMAX || @PRI_MACROS_BROKEN@
# undef PRIdMAX
-# if INTMAX_MAX > INT32_MAX
+# if @INT32_MAX_LT_INTMAX_MAX@
# define PRIdMAX PRId64
# else
# define PRIdMAX "ld"
@@ -492,7 +494,7 @@
# endif
# if !defined PRIiMAX || @PRI_MACROS_BROKEN@
# undef PRIiMAX
-# if INTMAX_MAX > INT32_MAX
+# if @INT32_MAX_LT_INTMAX_MAX@
# define PRIiMAX PRIi64
# else
# define PRIiMAX "li"
@@ -500,7 +502,7 @@
# endif
# if !defined PRIoMAX || @PRI_MACROS_BROKEN@
# undef PRIoMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define PRIoMAX PRIo64
# else
# define PRIoMAX "lo"
@@ -508,7 +510,7 @@
# endif
# if !defined PRIuMAX || @PRI_MACROS_BROKEN@
# undef PRIuMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define PRIuMAX PRIu64
# else
# define PRIuMAX "lu"
@@ -516,7 +518,7 @@
# endif
# if !defined PRIxMAX || @PRI_MACROS_BROKEN@
# undef PRIxMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define PRIxMAX PRIx64
# else
# define PRIxMAX "lx"
@@ -524,7 +526,7 @@
# endif
# if !defined PRIXMAX || @PRI_MACROS_BROKEN@
# undef PRIXMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define PRIXMAX PRIX64
# else
# define PRIXMAX "lX"
@@ -659,7 +661,7 @@
# endif
# endif
# ifdef INT64_MAX
-# if INT64_MAX == 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"
@@ -676,7 +678,7 @@
# endif
# endif
# ifdef UINT64_MAX
-# if UINT64_MAX == 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"
@@ -959,7 +961,7 @@
# if !defined SCNdMAX || @PRI_MACROS_BROKEN@
# undef SCNdMAX
-# if INTMAX_MAX > INT32_MAX
+# if @INT32_MAX_LT_INTMAX_MAX@
# define SCNdMAX SCNd64
# else
# define SCNdMAX "ld"
@@ -967,7 +969,7 @@
# endif
# if !defined SCNiMAX || @PRI_MACROS_BROKEN@
# undef SCNiMAX
-# if INTMAX_MAX > INT32_MAX
+# if @INT32_MAX_LT_INTMAX_MAX@
# define SCNiMAX SCNi64
# else
# define SCNiMAX "li"
@@ -975,7 +977,7 @@
# endif
# if !defined SCNoMAX || @PRI_MACROS_BROKEN@
# undef SCNoMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define SCNoMAX SCNo64
# else
# define SCNoMAX "lo"
@@ -983,7 +985,7 @@
# endif
# if !defined SCNuMAX || @PRI_MACROS_BROKEN@
# undef SCNuMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define SCNuMAX SCNu64
# else
# define SCNuMAX "lu"
@@ -991,7 +993,7 @@
# endif
# if !defined SCNxMAX || @PRI_MACROS_BROKEN@
# undef SCNxMAX
-# if UINTMAX_MAX > UINT32_MAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
# define SCNxMAX SCNx64
# else
# define SCNxMAX "lx"