(intmax_t, uintmax_t): Prefer long to long long if

both are 64 bits.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 94551cf8c74802313e814390a85cb386d64098cc..1ce4084af51ef35d2ec0f3e7026dba0853ac1a68 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * stdint_.h (intmax_t, uintmax_t): Prefer long to long long if
+       both are 64 bits, since this seems to be the tradition, and this
+       prevents gcc -Wformat from warning about usages with PRIuMAX.  If
+       we ever run into a host that prefers long long to long in this
+       case, we'll need another configure-time test.  Problem reported by
+       Jim Meyering.
+
 2006-07-02  Paul Eggert  <eggert@cs.ucla.edu>
 
        * Makefile.am (stdint.h): Sync from gnulib.

diff --git a/lib/stdint_.h b/lib/stdint_.h
index 4e582911a264c3d2ef33b409f7cbc6bda39ab5b6..b2a53dafa9904a3b2404af707adfff7df1fbf1dc 100644 (file)
--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -208,7 +208,7 @@
 
 #undef intmax_t
 #undef uintmax_t
-#if @HAVE_LONG_LONG_INT@
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 # define intmax_t long long int
 # define uintmax_t unsigned long long int
 #elif defined int64_t
@@ -434,7 +434,7 @@
 
 #undef INTMAX_C
 #undef UINTMAX_C
-#if @HAVE_LONG_LONG_INT@
+#if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 # define INTMAX_C(x)   x##LL
 # define UINTMAX_C(x)  x##ULL
 #elif defined int64_t