17 files changed, 21 insertions, 86 deletions

diff --git a/src/microhttpd/EXPORT.sym b/src/microhttpd/EXPORT.sym
deleted file mode 100644
index 402a0ef3..00000000
--- a/src/microhttpd/EXPORT.sym
+++ /dev/null
@@ -1,39 +0,0 @@
-MHD_start_daemon
-MHD_start_daemon_va
-MHD_stop_daemon
-MHD_get_fdset
-MHD_get_timeout
-MHD_run
-MHD_run_from_select
-MHD_get_connection_values
-MHD_set_connection_value
-MHD_lookup_connection_value
-MHD_queue_response
-MHD_create_response_from_callback
-MHD_create_response_from_data
-MHD_create_response_from_fd
-MHD_create_response_from_fd_at_offset
-MHD_create_response_from_buffer
-MHD_destroy_response
-MHD_add_response_header
-MHD_add_response_footer
-MHD_del_response_header
-MHD_get_response_headers
-MHD_get_response_header
-MHD_create_post_processor
-MHD_post_process
-MHD_quiesce_daemon
-MHD_destroy_post_processor
-MHD_get_daemon_info
-MHD_get_connection_info
-MHD_set_panic_func
-MHD_get_version
-MHD_digest_auth_get_username
-MHD_digest_auth_check
-MHD_queue_auth_fail_response
-MHD_basic_auth_get_username_password
-MHD_queue_basic_auth_fail_response
-MHD_add_connection
-MHD_set_connection_option
-MHD_suspend_connection
-MHD_resume_connection
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 54706f56..d3c4b286 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -6,10 +6,9 @@ AM_CPPFLAGS = \
   $(PLIBC_INCLUDE) \
   -I$(top_srcdir)/src/include \
   -I$(top_srcdir)/src/daemon \
+  $(HIDDEN_VISIBILITY_CFLAGS) \
   @LIBGCRYPT_CFLAGS@
 
-EXTRA_DIST = EXPORT.sym
-
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
@@ -23,7 +22,6 @@ libmicrohttpd_la_SOURCES = \
   response.c response.h
 libmicrohttpd_la_LDFLAGS = \
   $(MHD_LIB_LDFLAGS) \
-  -export-symbols $(top_srcdir)/src/microhttpd/EXPORT.sym \
   -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 
 if USE_COVERAGE
diff --git a/src/microhttpd/base64.c b/src/microhttpd/base64.c
index 3e390b8b..4fb4755e 100644
--- a/src/microhttpd/base64.c
+++ b/src/microhttpd/base64.c
@@ -26,7 +26,6 @@ static const char base64_digits[] =
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 
-HIDDEN_SYMBOL
 char *
 BASE64Decode(const char* src)
 {
diff --git a/src/microhttpd/base64.h b/src/microhttpd/base64.h
index 34948c07..ba96ca0c 100644
--- a/src/microhttpd/base64.h
+++ b/src/microhttpd/base64.h
@@ -11,7 +11,6 @@
 
 #include "platform.h"
 
-HIDDEN_SYMBOL
 char *
 BASE64Decode(const char* src);
 
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 7709a92d..684c5b01 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -257,7 +257,7 @@ need_100_continue (struct MHD_Connection *connection)
  * @param connection connection to close
  * @param termination_code termination reason to give
  */
-void HIDDEN_SYMBOL
+void
 MHD_connection_close (struct MHD_Connection *connection,
                       enum MHD_RequestTerminationCode termination_code)
 {
@@ -1927,7 +1927,6 @@ update_last_activity (struct MHD_Connection *connection)
  * @return always #MHD_YES (we should continue to process the
  *         connection)
  */
-HIDDEN_SYMBOL
 int
 MHD_connection_handle_read (struct MHD_Connection *connection)
 {
@@ -1991,7 +1990,6 @@ MHD_connection_handle_read (struct MHD_Connection *connection)
  * @return always #MHD_YES (we should continue to process the
  *         connection)
  */
-HIDDEN_SYMBOL
 int
 MHD_connection_handle_write (struct MHD_Connection *connection)
 {
@@ -2195,7 +2193,6 @@ cleanup_connection (struct MHD_Connection *connection)
  * @return #MHD_YES if we should continue to process the
  *         connection (not dead yet), #MHD_NO if it died
  */
-HIDDEN_SYMBOL
 int
 MHD_connection_handle_idle (struct MHD_Connection *connection)
 {
@@ -2633,7 +2630,6 @@ MHD_connection_handle_idle (struct MHD_Connection *connection)
  * @return #MHD_YES if we should continue to process the
  *         connection (not dead yet), #MHD_NO if it died
  */
-HIDDEN_SYMBOL
 int
 MHD_connection_epoll_update_ (struct MHD_Connection *connection)
 {
@@ -2681,7 +2677,6 @@ MHD_connection_epoll_update_ (struct MHD_Connection *connection)
  *
  * @param connection connection to initialize
  */
-HIDDEN_SYMBOL
 void
 MHD_set_http_callbacks_ (struct MHD_Connection *connection)
 {
diff --git a/src/microhttpd/connection.h b/src/microhttpd/connection.h
index 1520d46e..4b87c3ef 100644
--- a/src/microhttpd/connection.h
+++ b/src/microhttpd/connection.h
@@ -88,7 +88,7 @@ MHD_connection_handle_idle (struct MHD_Connection *connection);
  * @param connection connection to close
  * @param termination_code termination reason to give
  */
-void HIDDEN_SYMBOL
+void
 MHD_connection_close (struct MHD_Connection *connection,
                       enum MHD_RequestTerminationCode termination_code);
 
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c
index 474eece7..b566d83c 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -170,7 +170,6 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection)
  *
  * @param connection which callbacks should be modified
  */
-HIDDEN_SYMBOL
 void
 MHD_set_https_callbacks (struct MHD_Connection *connection)
 {
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index fb7eb145..b0a940fe 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -121,13 +121,11 @@ mhd_panic_std (void *cls,
 /**
  * Handler for fatal errors.
  */
-HIDDEN_SYMBOL
 MHD_PanicCallback mhd_panic;
 
 /**
  * Closure argument for "mhd_panic".
  */
-HIDDEN_SYMBOL
 void *mhd_panic_cls;
 
 
@@ -4141,11 +4139,11 @@ MHD_get_version (void)
 
 
 #ifdef __GNUC__
-#define ATTRIBUTE_CONSTRUCTOR __attribute__ ((constructor))
-#define ATTRIBUTE_DESTRUCTOR __attribute__ ((destructor))
+#define FUNC_CONSTRUCTOR(f) static void __attribute__ ((constructor)) f
+#define FUNC_DESTRUCTOR(f) static void __attribute__ ((destructor)) f
 #else  // !__GNUC__
-#define ATTRIBUTE_CONSTRUCTOR
-#define ATTRIBUTE_DESTRUCTOR
+#define FUNC_CONSTRUCTOR(f) _MHD_EXTERN void f
+#define FUNC_DESTRUCTOR(f) _MHD_EXTERN void f
 #endif  // __GNUC__
 
 #if HTTPS_SUPPORT
@@ -4158,8 +4156,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 /**
  * Initialize do setup work.
  */
-void ATTRIBUTE_CONSTRUCTOR
-MHD_init ()
+FUNC_CONSTRUCTOR (MHD_init) ()
 {
   mhd_panic = &mhd_panic_std;
   mhd_panic_cls = NULL;
@@ -4177,8 +4174,7 @@ MHD_init ()
 }
 
 
-void ATTRIBUTE_DESTRUCTOR
-MHD_fini ()
+FUNC_DESTRUCTOR (MHD_fini) ()
 {
 #if HTTPS_SUPPORT
   gnutls_global_deinit ();
diff --git a/src/microhttpd/internal.c b/src/microhttpd/internal.c
index 7afaba74..9b234fea 100644
--- a/src/microhttpd/internal.c
+++ b/src/microhttpd/internal.c
@@ -31,7 +31,6 @@
 /**
  * State to string dictionary.
  */
-HIDDEN_SYMBOL
 const char *
 MHD_state_to_string (enum MHD_CONNECTION_STATE state)
 {
@@ -91,7 +90,7 @@ MHD_state_to_string (enum MHD_CONNECTION_STATE state)
  * fprintf-like helper function for logging debug
  * messages.
  */
-void HIDDEN_SYMBOL
+void
 MHD_DLOG (const struct MHD_Daemon *daemon, const char *format, ...)
 {
   va_list va;
@@ -116,7 +115,6 @@ MHD_DLOG (const struct MHD_Daemon *daemon, const char *format, ...)
  * @return length of the resulting val (strlen(val) maybe
  *  shorter afterwards due to elimination of escape sequences)
  */
-HIDDEN_SYMBOL
 size_t
 MHD_http_unescape (void *cls,
                    struct MHD_Connection *connection,
@@ -167,7 +165,6 @@ MHD_http_unescape (void *cls,
 }
 
 
-HIDDEN_SYMBOL
 time_t
 MHD_monotonic_time (void)
 {
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 6146e2ac..9d50de25 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -189,7 +189,7 @@ struct MHD_NonceNc
  * fprintf-like helper function for logging debug
  * messages.
  */
-void HIDDEN_SYMBOL
+void
 MHD_DLOG (const struct MHD_Daemon *daemon,
           const char *format, ...);
 #endif
diff --git a/src/microhttpd/md5.c b/src/microhttpd/md5.c
index 309f492c..e35d5f26 100644
--- a/src/microhttpd/md5.c
+++ b/src/microhttpd/md5.c
@@ -150,7 +150,7 @@ MD5Transform(uint32_t buf[4],
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
  * initialization constants.
  */
-void HIDDEN_SYMBOL
+void
 MD5Init(struct MD5Context *ctx)
 {
     ctx->buf[0] = 0x67452301;
@@ -166,7 +166,7 @@ MD5Init(struct MD5Context *ctx)
  * Update context to reflect the concatenation of another buffer full
  * of bytes.
  */
-void HIDDEN_SYMBOL
+void
 MD5Update(struct MD5Context *ctx,
           const void *data,
           unsigned len)
@@ -218,7 +218,7 @@ MD5Update(struct MD5Context *ctx,
  * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
-void HIDDEN_SYMBOL
+void
 MD5Final (unsigned char digest[16],
           struct MD5Context *ctx)
 {
diff --git a/src/microhttpd/md5.h b/src/microhttpd/md5.h
index 077b2e8c..5e77774c 100644
--- a/src/microhttpd/md5.h
+++ b/src/microhttpd/md5.h
@@ -37,15 +37,15 @@ struct MD5Context
 };
 
 
-void  HIDDEN_SYMBOL
+void
 MD5Init(struct MD5Context *ctx);
 
-void HIDDEN_SYMBOL
+void
 MD5Update(struct MD5Context *ctx,
           const void *buf,
           unsigned len);
 
-void HIDDEN_SYMBOL
+void
 MD5Final(unsigned char digest[MD5_DIGEST_SIZE],
          struct MD5Context *ctx);
 
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c
index 06ef06b9..57962c17 100644
--- a/src/microhttpd/memorypool.c
+++ b/src/microhttpd/memorypool.c
@@ -83,7 +83,6 @@ struct MemoryPool
  * @param max maximum size of the pool
  * @return NULL on error
  */
-HIDDEN_SYMBOL
 struct MemoryPool *
 MHD_pool_create (size_t max)
 {
@@ -127,7 +126,7 @@ MHD_pool_create (size_t max)
  *
  * @param pool memory pool to destroy
  */
-void HIDDEN_SYMBOL
+void
 MHD_pool_destroy (struct MemoryPool *pool)
 {
   if (pool == NULL)
@@ -151,7 +150,6 @@ MHD_pool_destroy (struct MemoryPool *pool)
  * @return NULL if the pool cannot support size more
  *         bytes
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_allocate (struct MemoryPool *pool,
                    size_t size, int from_end)
@@ -195,7 +193,6 @@ MHD_pool_allocate (struct MemoryPool *pool,
  *         NULL if the pool cannot support @a new_size
  *         bytes (old continues to be valid for @a old_size)
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_reallocate (struct MemoryPool *pool,
                      void *old,
@@ -250,7 +247,6 @@ MHD_pool_reallocate (struct MemoryPool *pool,
  * @param size how many bytes need to be kept at this address
  * @return addr new address of @a keep (if it had to change)
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_reset (struct MemoryPool *pool,
                 void *keep,
diff --git a/src/microhttpd/memorypool.h b/src/microhttpd/memorypool.h
index 5fc52e6d..bf929d2f 100644
--- a/src/microhttpd/memorypool.h
+++ b/src/microhttpd/memorypool.h
@@ -44,7 +44,6 @@ struct MemoryPool;
  * @param max maximum size of the pool
  * @return NULL on error
  */
-HIDDEN_SYMBOL
 struct MemoryPool *
 MHD_pool_create (size_t max);
 
@@ -54,7 +53,7 @@ MHD_pool_create (size_t max);
  *
  * @param pool memory pool to destroy
  */
-void HIDDEN_SYMBOL
+void
 MHD_pool_destroy (struct MemoryPool *pool);
 
 
@@ -69,7 +68,6 @@ MHD_pool_destroy (struct MemoryPool *pool);
  * @return NULL if the pool cannot support size more
  *         bytes
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_allocate (struct MemoryPool *pool,
                    size_t size, int from_end);
@@ -92,7 +90,6 @@ MHD_pool_allocate (struct MemoryPool *pool,
  *         NULL if the pool cannot support new_size
  *         bytes (old continues to be valid for old_size)
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_reallocate (struct MemoryPool *pool,
                      void *old,
@@ -109,7 +106,6 @@ MHD_pool_reallocate (struct MemoryPool *pool,
  * @param size how many bytes need to be kept at this address
  * @return addr new address of "keep" (if it had to change)
  */
-HIDDEN_SYMBOL
 void *
 MHD_pool_reset (struct MemoryPool *pool,
                 void *keep,
diff --git a/src/microhttpd/reason_phrase.c b/src/microhttpd/reason_phrase.c
index f97d1fbf..c809fdd2 100644
--- a/src/microhttpd/reason_phrase.c
+++ b/src/microhttpd/reason_phrase.c
@@ -149,7 +149,6 @@ static const struct MHD_Reason_Block reasons[] = {
 };
 
 
-HIDDEN_SYMBOL
 const char *
 MHD_get_reason_phrase_for (unsigned int code)
 {
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index c95b9176..abaa64ca 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -469,7 +469,7 @@ MHD_destroy_response (struct MHD_Response *response)
 }
 
 
-void HIDDEN_SYMBOL
+void
 MHD_increment_response_rc (struct MHD_Response *response)
 {
   pthread_mutex_lock (&response->mutex);
diff --git a/src/microhttpd/response.h b/src/microhttpd/response.h
index c79b0058..dcf19350 100644
--- a/src/microhttpd/response.h
+++ b/src/microhttpd/response.h
@@ -31,7 +31,7 @@
  * Increment response RC.  Should this be part of the
  * public API?
  */
-void HIDDEN_SYMBOL
+void
 MHD_increment_response_rc (struct MHD_Response *response);