diff options
| author | David Bremner <david@tethera.net> | 2016-10-05 08:34:34 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-11-15 07:47:55 -0400 |
| commit | 0abcad7c0ec2099750720d02b97aa84ce0255f91 (patch) | |
| tree | 17e4beb03fc0d86a1d5590beb1406ced4e4e5d00 | |
| parent | 70c6ac377b29fd17d62d97d13a4c5223bf7785cb (diff) | |
lib: optionally silence Xapian deprecation warnings
This is not ideal, but the new API is not available in Xapian 1.2.x, and
it seems to soon to depend on Xapian >= 1.4
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | lib/database-private.h | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -1142,6 +1142,7 @@ COMMON_CONFIGURE_CFLAGS = \\ -DSTD_GETPWUID=\$(STD_GETPWUID) \\ -DSTD_ASCTIME=\$(STD_ASCTIME) \\ -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT) \\ + -DSILENCE_XAPIAN_DEPRECATION_WARNINGS \\ -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\ -DHAVE_XAPIAN_DB_RETRY_LOCK=\$(HAVE_XAPIAN_DB_RETRY_LOCK) \\ -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER) diff --git a/lib/database-private.h b/lib/database-private.h index ca71a92f..ccc1e9a1 100644 --- a/lib/database-private.h +++ b/lib/database-private.h @@ -32,6 +32,10 @@ #include "notmuch-private.h" +#ifdef SILENCE_XAPIAN_DEPRECATION_WARNINGS +#define XAPIAN_DEPRECATED(D) D +#endif + #include <xapian.h> #pragma GCC visibility push(hidden) |