X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase-private.h;h=140b54edf499dea41f00c38a8bb2f00440b16648;hp=5bb6e86c735fd80d53efcc801f4a4697cba5bd31;hb=b3caef1f0659dac8183441357c8fee500a940889;hpb=9439b217c349478b3603d5368f534acb1cd23974 diff --git a/lib/database-private.h b/lib/database-private.h index 5bb6e86c..140b54ed 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -21,10 +21,21 @@ #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; @@ -34,12 +45,12 @@ struct _notmuch_database { 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; - }; /* Convert tags from Xapian internal format to notmuch format. @@ -55,4 +66,6 @@ notmuch_tags_t * _notmuch_convert_tags (void *ctx, Xapian::TermIterator &i, Xapian::TermIterator &end); +#pragma GCC visibility pop + #endif