Use C99 macros "PRId64"/"PRId32" to format file sizes/offsets if available.

This fixes warning about mismatching int argument sizes on amd64.

diff --git a/ChangeLog b/ChangeLog
index 85fe1ff40913710f1f0f2df05c9356cff3546851..4e3550fc8deba37360843aaf4758f2a25d6424ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-22 16:34 +0200  Rocco Rutte  <pdmef@gmx.net>  (b97e95fd5786)
+
+       * init.h: Document that $check_mbox_size should be set before
+       mailboxes commands
+
+2008-05-22 14:06 +0200  Rocco Rutte  <pdmef@gmx.net>  (a697362846e9)
+
+       * ChangeLog, UPDATING: Mention requirement to encode X-Label: headers
+       in UPDATING
+
 2008-05-21 23:20 -0700  Rocco Rutte  <pdmef@gmx.net>  (bba92e401440)
 
        * imap/browse.c: Guard idata->mailbox read in imap_mailbox_state.

diff --git a/configure.ac b/configure.ac
index b61d6daaedd74f1c84d55210a9e667dce3626e61..7381f7abccb6fe3f3a10fe157f08779890556344 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,10 +88,18 @@ AH_TEMPLATE([ICONV_NONTRANS],
 AH_BOTTOM([/* fseeko portability defines */
 #ifdef HAVE_FSEEKO
 # define LOFF_T off_t
-# if SIZEOF_OFF_T == 8
-#  define OFF_T_FMT "%lld"
+# if HAVE_C99_INTTYPES && HAVE_INTTYPES_H
+#  if SIZEOF_OFF_T == 8
+#   define OFF_T_FMT "%" PRId64
+#  else
+#   define OFF_T_FMT "%" PRId32
+#  endif
 # else
-#  define OFF_T_FMT "%ld"
+#  if (SIZEOF_OFF_T == 8) && (SIZEOF_LONG == 4)
+#   define OFF_T_FMT "%lld"
+#  else
+#   define OFF_T_FMT "%ld"
+#  endif
 # endif
 #else
 # define LOFF_T long

diff --git a/m4/types.m4 b/m4/types.m4
index 5f219fbfcf3d192af8fc13e1edbf604f9b99fd22..e9aa116d048e3f5235aff54195a636f6c6fb697e 100644 (file)
--- a/m4/types.m4
+++ b/m4/types.m4
@@ -10,11 +10,11 @@ AC_DEFUN([MUTT_C99_INTTYPES],
 [dnl
 AC_CHECK_HEADERS([inttypes.h])
 AC_CHECK_TYPE([uint32_t],
-  [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])],
-  [AC_CHECK_SIZEOF(short)
-   AC_CHECK_SIZEOF(int)
-   AC_CHECK_SIZEOF(long)
-   AC_CHECK_SIZEOF(long long)])
+  [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])])
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)])
 AH_VERBATIM([X_HAVE_C99_INTTYPES],
   [#ifndef HAVE_C99_INTTYPES
 #  if SIZEOF_SHORT == 4
@@ -33,4 +33,3 @@ typedef unsigned long long uint64_t;
 #  endif
 #endif
   ])
-])