--- /dev/null
+Return-Path: <jani@nikula.org>\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 48669431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 14:30:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 V-WK4gyobssi for <notmuch@notmuchmail.org>;\r
+ Sat, 17 Aug 2013 14:30:01 -0700 (PDT)\r
+Received: from mail-bk0-f50.google.com (mail-bk0-f50.google.com\r
+ [209.85.214.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 83674431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 14:30:01 -0700 (PDT)\r
+Received: by mail-bk0-f50.google.com with SMTP id mz11so1046185bkb.9\r
+ for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 14:30:00 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+ bh=r9H7n3z2BQT3k5X8dNh2XgLVm9MJ5Z0o/K5o96V4TD4=;\r
+ b=PxwqAj2tgOa2pJlb8xgghJYNr+f2C2BlWP+jhoWUTKjI8fsCp5ump7m6rIE9ILXZUg\r
+ DQMaKwvC7aIwz+CL2BdYpUjDRIzSMrWx/EQZwf6T6FjeGtkqa5OP5hNEWqg04L4BZE9n\r
+ F/kaXWtdbQ9z6YMdXPPgPLHHCYar6626fCpXvJOxF4SjWNN7oC2Jz+jumqKTi426ERTe\r
+ 19yWW7Godjuf4KTi574RW5iwqhh73AIyeZx4Hy7D7f5adKIs+i94G+wMksSKb8+HqU6H\r
+ ndCaxiO76bgtB9nkH6Oqbqgz/nnGaSgffqp34YPoO+/zQIhuUjyL479IzqiJmii2XzWc\r
+ MJTQ==\r
+X-Gm-Message-State:\r
+ ALoCoQlKCOGAA9ITryPj3r1mvbsrGcTr4PzT71DxzG3u3dfzUP38cIZt1GaKPes/DTBOTHez2BqM\r
+X-Received: by 10.204.188.200 with SMTP id db8mr2663989bkb.12.1376774998912;\r
+ Sat, 17 Aug 2013 14:29:58 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+ [88.195.111.91])\r
+ by mx.google.com with ESMTPSA id m6sm552985bki.7.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 17 Aug 2013 14:29:58 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] lib: fix clang build\r
+Date: Sun, 18 Aug 2013 00:30:01 +0300\r
+Message-Id: <1376775001-16528-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+Cc: Simonas Kazlauskas <s@kazlauskas.me>\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: Sat, 17 Aug 2013 21:30:07 -0000\r
+\r
+Long story short, fix build on recent (3.2+) clang.\r
+\r
+The long story for posterity follows.\r
+\r
+gcc 4.6 added new warnings about structs with greater visibility than\r
+their fields. The warnings were silenced by adjusting visibility in\r
+\r
+commit d5523ead90b6be2b07d4af745b8ed9b980a6b9f1\r
+Author: Carl Worth <cworth@cworth.org>\r
+Date: Wed May 11 13:23:13 2011 -0700\r
+\r
+ Mark some structures in the library interface with visibility=default attribute.\r
+\r
+Later on,\r
+\r
+commit 3b76adf9e2c026dd03b820f4c6eab50e25444113\r
+Author: Austin Clements <amdragon@MIT.EDU>\r
+Date: Sat Jan 14 19:17:33 2012 -0500\r
+\r
+ lib: Add support for automatically excluding tags from queries\r
+\r
+changed visibility of struct _notmuch_string_list for the same reason, and\r
+\r
+commit 1a53f9f116fa7c460cda3df532be921baaafb082\r
+Author: Mark Walters <markwalters1009@gmail.com>\r
+Date: Thu Mar 1 22:30:38 2012 +0000\r
+\r
+ lib: Add the exclude flag to notmuch_query_search_threads\r
+\r
+split the struct _notmuch_string_list and its typedef\r
+notmuch_string_list_t as a way to make a forward declaration for\r
+_notmuch_thread_create().\r
+\r
+The subtle difference was that the struct definition now had 'visible'\r
+in it, while the typedef didn't, and it was within the #pragma GCC\r
+visibility push(hidden) block. This went unnoticed, as the then common\r
+versions of clang didn't care about this.\r
+\r
+A later change in clang (I did not dig into when this change was\r
+introduced) caused the following error:\r
+\r
+CXX -O2 lib/database.o\r
+In file included from lib/database.cc:21:\r
+In file included from ./lib/database-private.h:33:\r
+./lib/notmuch-private.h:479:8: error: visibility does not match previous declaration\r
+struct visible _notmuch_string_list {\r
+ ^\r
+./lib/notmuch-private.h:67:33: note: expanded from macro 'visible'\r
+ ^\r
+./lib/notmuch-private.h:52:13: note: previous attribute is here\r
+ ^\r
+1 error generated.\r
+make: *** [lib/database.o] Error 1\r
+\r
+This is slightly misleading due to the reference to the #pragma. The\r
+real culprit is the typedef within the #pragma.\r
+\r
+We could just add 'visible' to the typedef, or move the typedef\r
+outside of the #pragma, and be done with it, but juggle the\r
+declarations a bit to accommodate moving the typedef back with the\r
+struct, and keep the visibility attribute in one place.\r
+\r
+The problem was originally reported by Simonas Kazlauskas\r
+<s@kazlauskas.me> in id:20130418102507.GA23688@godbox but I was only\r
+able to reproduce and investigate now that I upgraded clang.\r
+---\r
+ lib/notmuch-private.h | 28 +++++++++++++---------------\r
+ 1 file changed, 13 insertions(+), 15 deletions(-)\r
+\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index eced03e..af185c7 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -162,8 +162,6 @@ typedef enum _notmuch_find_flags {\r
+ \r
+ typedef struct _notmuch_doc_id_set notmuch_doc_id_set_t;\r
+ \r
+-typedef struct _notmuch_string_list notmuch_string_list_t;\r
+-\r
+ /* database.cc */\r
+ \r
+ /* Lookup a prefix value by name.\r
+@@ -228,17 +226,6 @@ _notmuch_directory_create (notmuch_database_t *notmuch,\r
+ unsigned int\r
+ _notmuch_directory_get_document_id (notmuch_directory_t *directory);\r
+ \r
+-/* thread.cc */\r
+-\r
+-notmuch_thread_t *\r
+-_notmuch_thread_create (void *ctx,\r
+- notmuch_database_t *notmuch,\r
+- unsigned int seed_doc_id,\r
+- notmuch_doc_id_set_t *match_set,\r
+- notmuch_string_list_t *excluded_terms,\r
+- notmuch_exclude_t omit_exclude,\r
+- notmuch_sort_t sort);\r
+-\r
+ /* message.cc */\r
+ \r
+ notmuch_message_t *\r
+@@ -476,11 +463,11 @@ typedef struct _notmuch_string_node {\r
+ struct _notmuch_string_node *next;\r
+ } notmuch_string_node_t;\r
+ \r
+-struct visible _notmuch_string_list {\r
++typedef struct visible _notmuch_string_list {\r
+ int length;\r
+ notmuch_string_node_t *head;\r
+ notmuch_string_node_t **tail;\r
+-};\r
++} notmuch_string_list_t;\r
+ \r
+ notmuch_string_list_t *\r
+ _notmuch_string_list_create (const void *ctx);\r
+@@ -509,6 +496,17 @@ notmuch_filenames_t *\r
+ _notmuch_filenames_create (const void *ctx,\r
+ notmuch_string_list_t *list);\r
+ \r
++/* thread.cc */\r
++\r
++notmuch_thread_t *\r
++_notmuch_thread_create (void *ctx,\r
++ notmuch_database_t *notmuch,\r
++ unsigned int seed_doc_id,\r
++ notmuch_doc_id_set_t *match_set,\r
++ notmuch_string_list_t *excluded_terms,\r
++ notmuch_exclude_t omit_exclude,\r
++ notmuch_sort_t sort);\r
++\r
+ NOTMUCH_END_DECLS\r
+ \r
+ #ifdef __cplusplus\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff