From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 952B56DE0BF6 for ; Wed, 5 Oct 2016 04:34:52 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.007 X-Spam-Level: X-Spam-Status: No, score=-0.007 tagged_above=-999 required=5 tests=[AWL=0.004, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R8vRj8I4qbq5 for ; Wed, 5 Oct 2016 04:34:45 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 897886DE0941 for ; Wed, 5 Oct 2016 04:34:45 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1brkT0-0000up-7u; Wed, 05 Oct 2016 07:34:30 -0400 Received: (nullmailer pid 2914 invoked by uid 1000); Wed, 05 Oct 2016 11:34:40 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/2] lib: optionally silence Xapian deprecation warnings Date: Wed, 5 Oct 2016 08:34:34 -0300 Message-Id: <20161005113434.2847-3-david@tethera.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161005113434.2847-1-david@tethera.net> References: <20161005113434.2847-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2016 11:34:52 -0000 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 --- configure | 1 + lib/database-private.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configure b/configure index cc6746c..27b3b45 100755 --- a/configure +++ b/configure @@ -1141,6 +1141,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 ca71a92..ccc1e9a 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 #pragma GCC visibility push(hidden) -- 2.9.3