From: Austin Clements Date: Wed, 4 Dec 2013 16:19:45 +0000 (+1900) Subject: [PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03eba03d32a48ecd6fcf7134bc608dd089cc1734;p=notmuch-archives.git [PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION --- diff --git a/07/a3d7473ef192fa9890b11ed0571250b13d3093 b/07/a3d7473ef192fa9890b11ed0571250b13d3093 new file mode 100644 index 000000000..d8910b2de --- /dev/null +++ b/07/a3d7473ef192fa9890b11ed0571250b13d3093 @@ -0,0 +1,132 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C702B431FD8 + for ; Wed, 4 Dec 2013 08:20:04 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id W-KwqnHlA99z for ; + Wed, 4 Dec 2013 08:19:58 -0800 (PST) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 6A245431FC4 + for ; Wed, 4 Dec 2013 08:19:58 -0800 (PST) +X-AuditID: 12074425-b7fd96d000000c39-54-529f562d7d55 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id EE.89.03129.D265F925; Wed, 4 Dec 2013 11:19:57 -0500 (EST) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id rB4GJsub019852; + Wed, 4 Dec 2013 11:19:55 -0500 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rB4GJqlV001681 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Wed, 4 Dec 2013 11:19:53 -0500 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VoFB2-0002Vy-Jh; Wed, 04 Dec 2013 11:19:52 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION +Date: Wed, 4 Dec 2013 11:19:45 -0500 +Message-Id: <1386173986-9624-2-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu> +References: <1386173986-9624-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixCmqrasbNj/IoOOEpMWN1m5Gi6bpzhbX + b85kdmD2uHX/NbvHs1W3mD22HHrPHMAcxWWTkpqTWZZapG+XwJUx/fxqloInAhXrpt5ib2A8 + wNvFyMkhIWAi8fLxY3YIW0ziwr31bCC2kMBsJon3H2q6GLmA7A2MEhtvHmeBcG4zSZzvfc0O + 4cxllPi7+gwTSAubgIbEtv3LGUFsEQFpiZ13Z7OC2MwCXhLLLvSD2cICvhJrT69gBrFZBFQl + 2g6dBVvNK2AvMfnQLagzlCQWntoGVs8p4CDx7elRVoiT7CU2vOhhncDIv4CRYRWjbEpulW5u + YmZOcWqybnFyYl5eapGuhV5uZoleakrpJkZQcLG7qO5gnHBI6RCjAAejEg+vYvq8ICHWxLLi + ytxDjJIcTEqivILB84OE+JLyUyozEosz4otKc1KLDzFKcDArifBODgTK8aYkVlalFuXDpKQ5 + WJTEeW9x2AcJCaQnlqRmp6YWpBbBZGU4OJQkeG1DgRoFi1LTUyvSMnNKENJMHJwgw3mAhsuC + 1PAWFyTmFmemQ+RPMSpKifMeDgFKCIAkMkrz4Hph0f+KURzoFWHeDJB2HmDigOt+BTSYCWhw + 84N5IINLEhFSUg2M7io2QW9vT09b9KqduZTda88qjyf8R858T9DydI63fbRbk/Xqv60rc0JF + 33farZ8r7LjAq4Sr49KuiM+MCrardydxK9nOPPxke9tUbzGNrs8rvyX6vznSLXcxZ3pNw4tp + iStd3cJeBBqWvbbMa7g1b++thsiHLMdE+6KPZlllTuy1sv3myRWhxFKckWioxVxUnAgAFOU1 + Q9kCAAA= +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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, 04 Dec 2013 16:20:05 -0000 + +This makes it clear that these macros refer to the *library* version, +and not to the notmuch application-level release. Since there are no +consumers of these macros yet, this is now or never. +--- + lib/notmuch.h | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lib/notmuch.h b/lib/notmuch.h +index 42188a8..cb108ef 100644 +--- a/lib/notmuch.h ++++ b/lib/notmuch.h +@@ -45,9 +45,9 @@ NOTMUCH_BEGIN_DECLS + * The library version number. This must agree with the soname + * version in Makefile.local. + */ +-#define NOTMUCH_MAJOR_VERSION 3 +-#define NOTMUCH_MINOR_VERSION 0 +-#define NOTMUCH_MICRO_VERSION 0 ++#define LIBNOTMUCH_MAJOR_VERSION 3 ++#define LIBNOTMUCH_MINOR_VERSION 0 ++#define LIBNOTMUCH_MICRO_VERSION 0 + + /* + * Check the version of the notmuch library being compiled against. +@@ -55,19 +55,19 @@ NOTMUCH_BEGIN_DECLS + * Return true if the library being compiled against is of the + * specified version or above. For example: + * +- * #if NOTMUCH_CHECK_VERSION(0, 18, 0) +- * (code requiring notmuch 0.18 or above) ++ * #if LIBNOTMUCH_CHECK_VERSION(3, 0, 0) ++ * (code requiring libnotmuch 3.0.0 or above) + * #endif + * +- * NOTMUCH_CHECK_VERSION has been defined since version 0.17.0; you ++ * LIBNOTMUCH_CHECK_VERSION has been defined since version 3.0.0; you + * can use #if !defined(NOTMUCH_CHECK_VERSION) to check for versions + * prior to that. + */ +-#define NOTMUCH_CHECK_VERSION (major, minor, micro) \ +- (NOTMUCH_MAJOR_VERSION > (major) || \ +- (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION > (minor)) || \ +- (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION == (minor) && \ +- NOTMUCH_MICRO_VERSION >= (micro))) ++#define LIBNOTMUCH_CHECK_VERSION (major, minor, micro) \ ++ (LIBNOTMUCH_MAJOR_VERSION > (major) || \ ++ (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \ ++ (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION == (minor) && \ ++ LIBNOTMUCH_MICRO_VERSION >= (micro))) + + typedef int notmuch_bool_t; + +-- +1.8.4.rc3 +