notmuch-private.h: Move NOTMUCH_BEGIN_DECLS earlier

[notmuch] / notmuch-private.h

diff --git a/notmuch-private.h b/notmuch-private.h
index 384cc2de50e6cbaf2028c8ac5546f906a8682366..7cd003f84e5607f997362cc4e1aec4a69d7c5c29 100644 (file)
--- a/notmuch-private.h
+++ b/notmuch-private.h
@@ -23,6 +23,8 @@
 
 #include "notmuch.h"
 
+NOTMUCH_BEGIN_DECLS
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE /* For getline */
 #endif
@@ -39,8 +41,6 @@
 #include <unistd.h>
 #include <ctype.h>
 
-NOTMUCH_BEGIN_DECLS
-
 #include <talloc.h>
 
 #include "xutil.h"
@@ -76,13 +76,15 @@ typedef enum {
     NOTMUCH_VALUE_DATE = 2
 } notmuch_value_t;
 
-/* Xapian complains if we provide a term longer than this. */
-#define NOTMUCH_MAX_TERM 245
+/* Xapian (with flint backend) complains if we provide a term longer
+ * than this, but I haven't yet found a way to query the limit
+ * programmatically. */
+#define NOTMUCH_TERM_MAX 245
 
 /* message.cc */
 
 notmuch_message_t *
-_notmuch_message_create (notmuch_results_t *owner,
+_notmuch_message_create (const void *talloc_owner,
                         notmuch_database_t *notmuch,
                         unsigned int doc_id);