X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-private-cxx.h;fp=notmuch-private-cxx.h;h=c7aa97a6010d1c6805f812c2d7fb69822b2b1845;hp=e177bf1f48698930f7ff280bb8ed504c79633f8e;hb=789495919aaaba47040faded49276b217068c6af;hpb=2affed0851d85a08f6b0700f7128f97cae6b6024

diff --git a/notmuch-private-cxx.h b/notmuch-private-cxx.h
index e177bf1f..c7aa97a6 100644
--- a/notmuch-private-cxx.h
+++ b/notmuch-private-cxx.h
@@ -34,27 +34,9 @@
 /* tags.cc */
 /***********/
 
-typedef struct _notmuch_terms {
-    char prefix_char;
-    Xapian::TermIterator iterator;
-    Xapian::TermIterator iterator_end;
-} notmuch_terms_t;
-
-struct _notmuch_tags {
-    notmuch_terms_t terms;
-};
-
-notmuch_terms_t *
-_notmuch_terms_create (void *ctx,
-		       Xapian::Document doc,
-		       const char *prefix_name);
-
-/* The assertion is to ensure that 'type' is a derivative of
- * notmuch_terms_t in that it contains a notmuch_terms_t as its first
- * member. We do this by name of 'terms' as opposed to type, because
- * that's as clever as I've been so far. */
-#define _notmuch_terms_create_type(ctx, doc, prefix_name, type) \
-    (COMPILE_TIME_ASSERT(offsetof(type, terms) == 0),		\
-     (type *) _notmuch_terms_create (ctx, doc, prefix_name))
+notmuch_tags_t *
+_notmuch_tags_create_terms (void *ctx,
+			    Xapian::Document doc,
+			    const char *prefix_name);
 
 #endif