X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=database.cc;h=041cffdc9afe49b01a2c54e86a87b88610d25b0d;hp=7e678d87b8a506524663814e55b502309c74ed37;hb=466a7bbf620e4bf1b57097a6d3c474159c475b6d;hpb=cd4a8734d3bb151df70d51a84903bff994439b05

diff --git a/database.cc b/database.cc
index 7e678d87..041cffdc 100644
--- a/database.cc
+++ b/database.cc
@@ -18,7 +18,7 @@
  * Author: Carl Worth <cworth@cworth.org>
  */
 
-#include "notmuch-private.h"
+#include "database-private.h"
 
 #include <iostream>
 
@@ -28,12 +28,6 @@
 
 using namespace std;
 
-struct _notmuch_database {
-    char *path;
-    Xapian::WritableDatabase *xapian_db;
-    Xapian::TermGenerator *term_gen;
-};
-
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
 /* Xapian complains if we provide a term longer than this. */
@@ -463,6 +457,7 @@ notmuch_database_open (const char *path)
     notmuch->path = xstrdup (path);
 
     try {
+	Xapian::PostingIterator i;
 	notmuch->xapian_db = new Xapian::WritableDatabase (xapian_path,
 							   Xapian::DB_CREATE_OR_OPEN);
     } catch (const Xapian::Error &error) {