X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fdatabase-private.h;h=41918d760fe82bed3c960f07f08f30159d3e4231;hb=c20be126e5e52af9b8cdff5685124e4a867e375a;hp=643b0507dc26c0500d980993107d9d7e7b911fe1;hpb=c3c52e464b8b0e024a01feacfeb34cc4ce1f3d62;p=notmuch diff --git a/lib/database-private.h b/lib/database-private.h index 643b0507..41918d76 100644 --- 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 + #include "notmuch-private.h" #include 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.