aboutsummaryrefslogtreecommitdiff
path: root/lib/database.cc
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2016-10-04 21:35:23 -0300
committerDavid Bremner <david@tethera.net>2016-10-06 22:45:46 -0300
commitaf8903df34647d9456e8f3fe26a164959969b451 (patch)
tree875e3997ece59ac3975cca6437fa653c8792a05f /lib/database.cc
parentdbf61427896a17b2f91cf8f79501df420debab8d (diff)
require xapian >= 1.2.6
It seems that no-one tried to compile without Xapian compact support since March of 2015, since that's when I introduced a syntax error in that branch of the ifdef. Given the choice of maintaining this underused branch of code, or bumping the Xapian dependency to a version from 2011, it seems reasonable to do the latter.
Diffstat (limited to 'lib/database.cc')
-rw-r--r--lib/database.cc12
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/database.cc b/lib/database.cc
index 4bfae019..f0bfe566 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1143,7 +1143,6 @@ notmuch_database_close (notmuch_database_t *notmuch)
return status;
}
-#if HAVE_XAPIAN_COMPACT
static int
unlink_cb (const char *path,
unused (const struct stat *sb),
@@ -1327,17 +1326,6 @@ notmuch_database_compact (const char *path,
return ret;
}
-#else
-notmuch_status_t
-notmuch_database_compact (unused (const char *path),
- unused (const char *backup_path),
- unused (notmuch_compact_status_cb_t status_cb),
- unused (void *closure))
-{
- _notmuch_database_log (notmuch, "notmuch was compiled against a xapian version lacking compaction support.\n");
- return NOTMUCH_STATUS_UNSUPPORTED_OPERATION;
-}
-#endif
notmuch_status_t
notmuch_database_destroy (notmuch_database_t *notmuch)