[PATCH] lib: fix definition of LIBNOTMUCH_CHECK_VERSION

diff --git a/13/ea1e45f78790a6b626a680e3d7a282226ec202 b/13/ea1e45f78790a6b626a680e3d7a282226ec202
new file mode 100644 (file)
index 0000000..f67640d
--- /dev/null
+++ b/13/ea1e45f78790a6b626a680e3d7a282226ec202
@@ -0,0 +1,79 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 2EF1C6DE0130\r
+ for <notmuch@notmuchmail.org>; Tue,  7 Jun 2016 03:38:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.011\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.011 tagged_above=-999 required=5\r
+ tests=[AWL=-0.000, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id oBiu3v0Jkl2Y for <notmuch@notmuchmail.org>;\r
+ Tue,  7 Jun 2016 03:38:19 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 78DCC6DE00DA\r
+ for <notmuch@notmuchmail.org>; Tue,  7 Jun 2016 03:38:19 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1bAEOc-0006LI-Gt; Tue, 07 Jun 2016 06:38:06 -0400\r
+Received: (nullmailer pid 17473 invoked by uid 1000);\r
+ Tue, 07 Jun 2016 10:38:06 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: fix definition of LIBNOTMUCH_CHECK_VERSION\r
+Date: Tue,  7 Jun 2016 07:37:57 -0300\r
+Message-Id: <1465295877-17431-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <87lh2inyub.fsf@tesseract.cs.unb.ca>\r
+References: <87lh2inyub.fsf@tesseract.cs.unb.ca>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 07 Jun 2016 10:38:27 -0000\r
+\r
+Fix bug reported in id:20160606124522.g2y2eazhhrwjsa4h@flatcap.org\r
+\r
+Although the C99 standard 6.10 is a little non-obvious on this point,\r
+the docs for e.g. gcc are unambiguous. And indeed in practice with the\r
+extra space, this code fails\r
+\r
+#include <stdio.h>\r
+#define foo (x) (x+1)\r
+\r
+int main(int argc, char **argv){\r
+  printf("%d\n",foo(1));\r
+}\r
+---\r
+ lib/notmuch.h | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 29713ae..d4a97cb 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -93,7 +93,7 @@ NOTMUCH_BEGIN_DECLS\r
+  * #endif\r
+  * @endcode\r
+  */\r
+-#define LIBNOTMUCH_CHECK_VERSION (major, minor, micro)                        \\r
++#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)                 \\r
+     (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                    \\r
+      (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \\r
+      (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION == (minor) && \\r
+-- \r
+2.8.1\r
+\r