X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase-private.h;h=81097509244ae76aa04db74e795f122e49dc28fc;hp=5891584ec978e5f2868e5c87533462bff083b775;hb=d9d3d3e6f06a76dc0fbe24c9655b64acfcd4b9e4;hpb=909f52bd8c4bdfa11cd3e75e3d0959e0293689bd diff --git a/lib/database-private.h b/lib/database-private.h index 5891584e..81097509 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -21,20 +21,37 @@ #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 +#pragma GCC visibility push(hidden) + struct _notmuch_database { notmuch_bool_t exception_reported; + char *path; + + notmuch_bool_t needs_upgrade; notmuch_database_mode_t mode; Xapian::Database *xapian_db; + + unsigned int last_doc_id; + uint64_t last_thread_id; + Xapian::QueryParser *query_parser; Xapian::TermGenerator *term_gen; Xapian::ValueRangeProcessor *value_range_processor; - - notmuch_bool_t needs_upgrade; + notmuch_bool_t maildir_sync; }; /* Convert tags from Xapian internal format to notmuch format. @@ -50,4 +67,6 @@ notmuch_tags_t * _notmuch_convert_tags (void *ctx, Xapian::TermIterator &i, Xapian::TermIterator &end); +#pragma GCC visibility pop + #endif