Fix printf for when uint64_t != unsigned long long int

Thanks to Michal Sojka <sojkam1@fel.cvut.cz> for pointing out the
correct fix, which I verified in the freely-available WG14/N1124 draft
(from the C99 working group) which is available here:

http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1124.pdf

diff --git a/lib/database-private.h b/lib/database-private.h
index 5bb6e86c735fd80d53efcc801f4a4697cba5bd31..41918d760fe82bed3c960f07f08f30159d3e4231 100644 (file)
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -21,6 +21,15 @@
 #ifndef NOTMUCH_DATABASE_PRIVATE_H
 #define NOTMUCH_DATABASE_PRIVATE_H
 
+/* According to WG14/N1124, a C++ implementation won't provide us a
+ * macro like PRIx64 (which gives a printf format string for
+ * formatting a uint64_t as hexadecimal) unless we define
+ * __STDC_FORMAT_MACROS before including inttypes.h. That's annoying,
+ * but there it is.
+ */
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+
 #include "notmuch-private.h"
 
 #include <xapian.h>

diff --git a/lib/database.cc b/lib/database.cc
index 8641321511bd12c85eac6e1c91fe9c486d92e4c5..2b5b64dffd9bf0499a0ca70534eba115366610b3 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1306,7 +1306,7 @@ _notmuch_database_generate_thread_id (notmuch_database_t *notmuch)
 
     notmuch->last_thread_id++;
 
-    sprintf (thread_id, "%016llx", notmuch->last_thread_id);
+    sprintf (thread_id, "%016" PRIx64, notmuch->last_thread_id);
 
     db->set_metadata ("last_thread_id", thread_id);