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