[notmuch] [PATCH] GCC3.5 fix

diff --git a/bf/fe808106f3441c98e540cc5309cbc8f84b6359 b/bf/fe808106f3441c98e540cc5309cbc8f84b6359
new file mode 100644 (file)
index 0000000..7e3d3f8
--- /dev/null
+++ b/bf/fe808106f3441c98e540cc5309cbc8f84b6359
@@ -0,0 +1,91 @@
+Return-Path: <geocar-notmuch@internetconnection.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 olra.theworths.org (Postfix) with ESMTP id 45DFB431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Jan 2010 12:31:46 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.246\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.246 tagged_above=-999 required=5\r
+       tests=[AWL=-0.247, BAYES_50=0.001] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id oOnZSxdr2+Po for <notmuch@notmuchmail.org>;\r
+       Thu, 21 Jan 2010 12:31:45 -0800 (PST)\r
+Received: from proxy.dmvnoc.com (proxy.dmvnoc.com [216.169.144.254])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4C4A0431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Jan 2010 12:31:45 -0800 (PST)\r
+Received: (qmail 11593 invoked from network); 21 Jan 2010 20:31:40 +0000\r
+Received: from unknown (HELO ?192.168.1.19?) (192.168.1.19)\r
+       by mail.internetconnection.net with SMTP; 21 Jan 2010 20:31:40 +0000\r
+From: Geo Carncross <geocar-notmuch@internetconnection.net>\r
+To: notmuch@notmuchmail.org\r
+Content-Type: multipart/mixed; boundary="=-LLZRzZQRpdqt/RmcKXoQ"\r
+Date: Thu, 21 Jan 2010 15:31:44 -0500\r
+Message-ID: <1264105904.3941.121.camel@dwarf>\r
+Mime-Version: 1.0\r
+X-Mailer: Evolution 2.28.1 \r
+Subject: [notmuch] [PATCH] GCC3.5 fix\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 21 Jan 2010 20:31:46 -0000\r
+\r
+\r
+--=-LLZRzZQRpdqt/RmcKXoQ\r
+Content-Type: text/plain; charset="UTF-8"\r
+Content-Transfer-Encoding: 7bit\r
+\r
+I have reason to need GCC 3.5 which doesn't process the unused(x) macro\r
+correctly. This is probably a bug in 3.5, nevertheless the patch is\r
+simple and corrects the build.\r
+\r
+GCC 3.5 also does not understand -Wextra but Makefile is bound to change\r
+less frequently, so I did not include a patch for that.\r
+\r
+\r
+--=-LLZRzZQRpdqt/RmcKXoQ\r
+Content-Disposition: attachment; filename="notmuch_gcc_35.patch"\r
+Content-Type: text/x-patch; name="notmuch_gcc_35.patch"; charset="UTF-8"\r
+Content-Transfer-Encoding: 7bit\r
+\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index c7fb0ef..ad6dcd8 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -74,7 +74,7 @@ _internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2);\r
+     _internal_error (format " (%s).\n",                       \\r
+                    ##__VA_ARGS__, __location__)\r
+ \r
+-#define unused(x) x __attribute__ ((unused))\r
++#define unused(x) x __attribute__((unused))\r
+ \r
+ /* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of\r
+  * unlikely. The talloc source code comes to us via the GNU LGPL v. 3.\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 77766de..87e599a 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -49,7 +49,7 @@\r
+ \r
+ #include <talloc.h>\r
+ \r
+-#define unused(x) x __attribute__ ((unused))\r
++#define unused(x) x __attribute__((unused))\r
+ \r
+ /* There's no point in continuing when we've detected that we've done\r
+  * something wrong internally (as opposed to the user passing in a\r
+\r
+--=-LLZRzZQRpdqt/RmcKXoQ--\r
+\r