Fix printf for when uint64_t != unsigned long long int

[notmuch] / lib / database-private.h

diff --git a/lib/database-private.h b/lib/database-private.h
index 643b0507dc26c0500d980993107d9d7e7b911fe1..41918d760fe82bed3c960f07f08f30159d3e4231 100644 (file)
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -21,18 +21,34 @@
 #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>
 
 struct _notmuch_database {
     notmuch_bool_t exception_reported;
+
     char *path;
+
+    notmuch_bool_t needs_upgrade;
     notmuch_database_mode_t mode;
     Xapian::Database *xapian_db;
+
+    uint64_t last_thread_id;
+
     Xapian::QueryParser *query_parser;
     Xapian::TermGenerator *term_gen;
     Xapian::ValueRangeProcessor *value_range_processor;
+
 };
 
 /* Convert tags from Xapian internal format to notmuch format.