1 Return-Path: <amdragon@mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id C702B431FD8
\r
6 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 08:20:04 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id W-KwqnHlA99z for <notmuch@notmuchmail.org>;
\r
16 Wed, 4 Dec 2013 08:19:58 -0800 (PST)
\r
17 Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 6A245431FC4
\r
22 for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 08:19:58 -0800 (PST)
\r
23 X-AuditID: 12074425-b7fd96d000000c39-54-529f562d7d55
\r
24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id EE.89.03129.D265F925; Wed, 4 Dec 2013 11:19:57 -0500 (EST)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id rB4GJsub019852;
\r
31 Wed, 4 Dec 2013 11:19:55 -0500
\r
32 Received: from drake.dyndns.org
\r
33 (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
34 [216.15.114.40]) (authenticated bits=0)
\r
35 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
36 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id rB4GJqlV001681
\r
37 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
38 Wed, 4 Dec 2013 11:19:53 -0500
\r
39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)
\r
40 (envelope-from <amdragon@mit.edu>)
\r
41 id 1VoFB2-0002Vy-Jh; Wed, 04 Dec 2013 11:19:52 -0500
\r
42 From: Austin Clements <amdragon@MIT.EDU>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH 2/3] lib: Replace NOTMUCH_*_VERSION with LIBNOTMUCH_*_VERSION
\r
45 Date: Wed, 4 Dec 2013 11:19:45 -0500
\r
46 Message-Id: <1386173986-9624-2-git-send-email-amdragon@mit.edu>
\r
47 X-Mailer: git-send-email 1.8.4.rc3
\r
48 In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
49 References: <1386173986-9624-1-git-send-email-amdragon@mit.edu>
\r
50 X-Brightmail-Tracker:
\r
51 H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsUixCmqrasbNj/IoOOEpMWN1m5Gi6bpzhbX
\r
52 b85kdmD2uHX/NbvHs1W3mD22HHrPHMAcxWWTkpqTWZZapG+XwJUx/fxqloInAhXrpt5ib2A8
\r
53 wNvFyMkhIWAi8fLxY3YIW0ziwr31bCC2kMBsJon3H2q6GLmA7A2MEhtvHmeBcG4zSZzvfc0O
\r
54 4cxllPi7+gwTSAubgIbEtv3LGUFsEQFpiZ13Z7OC2MwCXhLLLvSD2cICvhJrT69gBrFZBFQl
\r
55 2g6dBVvNK2AvMfnQLagzlCQWntoGVs8p4CDx7elRVoiT7CU2vOhhncDIv4CRYRWjbEpulW5u
\r
56 YmZOcWqybnFyYl5eapGuhV5uZoleakrpJkZQcLG7qO5gnHBI6RCjAAejEg+vYvq8ICHWxLLi
\r
57 ytxDjJIcTEqivILB84OE+JLyUyozEosz4otKc1KLDzFKcDArifBODgTK8aYkVlalFuXDpKQ5
\r
58 WJTEeW9x2AcJCaQnlqRmp6YWpBbBZGU4OJQkeG1DgRoFi1LTUyvSMnNKENJMHJwgw3mAhsuC
\r
59 1PAWFyTmFmemQ+RPMSpKifMeDgFKCIAkMkrz4Hph0f+KURzoFWHeDJB2HmDigOt+BTSYCWhw
\r
60 84N5IINLEhFSUg2M7io2QW9vT09b9KqduZTda88qjyf8R858T9DydI63fbRbk/Xqv60rc0JF
\r
61 33farZ8r7LjAq4Sr49KuiM+MCrardydxK9nOPPxke9tUbzGNrs8rvyX6vznSLXcxZ3pNw4tp
\r
62 iStd3cJeBBqWvbbMa7g1b++thsiHLMdE+6KPZlllTuy1sv3myRWhxFKckWioxVxUnAgAFOU1
\r
64 X-BeenThere: notmuch@notmuchmail.org
\r
65 X-Mailman-Version: 2.1.13
\r
67 List-Id: "Use and development of the notmuch mail system."
\r
68 <notmuch.notmuchmail.org>
\r
69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
72 List-Post: <mailto:notmuch@notmuchmail.org>
\r
73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
75 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
76 X-List-Received-Date: Wed, 04 Dec 2013 16:20:05 -0000
\r
78 This makes it clear that these macros refer to the *library* version,
\r
79 and not to the notmuch application-level release. Since there are no
\r
80 consumers of these macros yet, this is now or never.
\r
82 lib/notmuch.h | 22 +++++++++++-----------
\r
83 1 file changed, 11 insertions(+), 11 deletions(-)
\r
85 diff --git a/lib/notmuch.h b/lib/notmuch.h
\r
86 index 42188a8..cb108ef 100644
\r
89 @@ -45,9 +45,9 @@ NOTMUCH_BEGIN_DECLS
\r
90 * The library version number. This must agree with the soname
\r
91 * version in Makefile.local.
\r
93 -#define NOTMUCH_MAJOR_VERSION 3
\r
94 -#define NOTMUCH_MINOR_VERSION 0
\r
95 -#define NOTMUCH_MICRO_VERSION 0
\r
96 +#define LIBNOTMUCH_MAJOR_VERSION 3
\r
97 +#define LIBNOTMUCH_MINOR_VERSION 0
\r
98 +#define LIBNOTMUCH_MICRO_VERSION 0
\r
101 * Check the version of the notmuch library being compiled against.
\r
102 @@ -55,19 +55,19 @@ NOTMUCH_BEGIN_DECLS
\r
103 * Return true if the library being compiled against is of the
\r
104 * specified version or above. For example:
\r
106 - * #if NOTMUCH_CHECK_VERSION(0, 18, 0)
\r
107 - * (code requiring notmuch 0.18 or above)
\r
108 + * #if LIBNOTMUCH_CHECK_VERSION(3, 0, 0)
\r
109 + * (code requiring libnotmuch 3.0.0 or above)
\r
112 - * NOTMUCH_CHECK_VERSION has been defined since version 0.17.0; you
\r
113 + * LIBNOTMUCH_CHECK_VERSION has been defined since version 3.0.0; you
\r
114 * can use #if !defined(NOTMUCH_CHECK_VERSION) to check for versions
\r
117 -#define NOTMUCH_CHECK_VERSION (major, minor, micro) \
\r
118 - (NOTMUCH_MAJOR_VERSION > (major) || \
\r
119 - (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION > (minor)) || \
\r
120 - (NOTMUCH_MAJOR_VERSION == (major) && NOTMUCH_MINOR_VERSION == (minor) && \
\r
121 - NOTMUCH_MICRO_VERSION >= (micro)))
\r
122 +#define LIBNOTMUCH_CHECK_VERSION (major, minor, micro) \
\r
123 + (LIBNOTMUCH_MAJOR_VERSION > (major) || \
\r
124 + (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \
\r
125 + (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION == (minor) && \
\r
126 + LIBNOTMUCH_MICRO_VERSION >= (micro)))
\r
128 typedef int notmuch_bool_t;
\r