From 30c475c1ef3d6823ed9ab0affc30328726c5240f Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani@nikula.org>
Date: Wed, 10 May 2017 22:42:12 +0300
Subject: [PATCH] build: visibility=default for library structs is no longer
 needed

Commit d5523ead90b6 ("Mark some structures in the library interface
with visibility=default attribute.") fixed some mixed visibility
issues with structs. With the symbol default visibility reversed, this
is no longer a problem.
---
 lib/message.cc        |  2 +-
 lib/notmuch-private.h | 10 ++--------
 lib/query.cc          |  2 +-
 lib/thread.cc         |  2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/message.cc b/lib/message.cc
index c2721191..b330dcce 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -26,7 +26,7 @@
 
 #include <gmime/gmime.h>
 
-struct visible _notmuch_message {
+struct _notmuch_message {
     notmuch_database_t *notmuch;
     Xapian::docid doc_id;
     int frozen;
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 926707d8..ac315e4c 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -74,12 +74,6 @@ NOTMUCH_BEGIN_DECLS
 
 #define unused(x) x __attribute__ ((unused))
 
-#ifdef __cplusplus
-# define visible __attribute__((visibility("default")))
-#else
-# define visible
-#endif
-
 /* 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.
  */
@@ -453,7 +447,7 @@ typedef struct _notmuch_message_list {
  * somewhere with some nasty C++ objects in it. We'll try to maintain
  * ignorance of that here. (See notmuch_mset_messages_t in query.cc)
  */
-struct visible _notmuch_messages {
+struct _notmuch_messages {
     notmuch_bool_t is_of_list_type;
     notmuch_doc_id_set_t *excluded_doc_ids;
     notmuch_message_node_t *iterator;
@@ -522,7 +516,7 @@ typedef struct _notmuch_string_node {
     struct _notmuch_string_node *next;
 } notmuch_string_node_t;
 
-typedef struct visible _notmuch_string_list {
+typedef struct _notmuch_string_list {
     int length;
     notmuch_string_node_t *head;
     notmuch_string_node_t **tail;
diff --git a/lib/query.cc b/lib/query.cc
index 212e27f0..9c6ecc8d 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -49,7 +49,7 @@ struct _notmuch_doc_id_set {
 #define DOCIDSET_WORD(bit) ((bit) / CHAR_BIT)
 #define DOCIDSET_BIT(bit) ((bit) % CHAR_BIT)
 
-struct visible _notmuch_threads {
+struct _notmuch_threads {
     notmuch_query_t *query;
 
     /* The ordered list of doc ids matched by the query. */
diff --git a/lib/thread.cc b/lib/thread.cc
index 561ca5be..1a1ecfa5 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -26,7 +26,7 @@
 
 #define EMPTY_STRING(s) ((s)[0] == '\0')
 
-struct visible _notmuch_thread {
+struct _notmuch_thread {
     notmuch_database_t *notmuch;
     char *thread_id;
     char *subject;
-- 
2.43.0