[libmicrohttpd] branch master updated (cd5ad7aa -> b9ed765c)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from cd5ad7aa digestauth: always use master daemon only
     new f1e6de45 internal.h: fixed static function placement
     new b9ed765c Fixed compiler error introduced by 
cd5ad7aaadd8f169f79ba3564d49d7f2889093b8

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/daemon.c   | 2 +-
 src/microhttpd/internal.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 6b7d8355..e1bc4812 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -7486,7 +7486,7 @@ MHD_start_daemon_va (unsigned int flags,
         d->nnc = NULL;
         d->nonce_nc_size = 0;
 #if defined(MHD_USE_THREADS)
-        memset (d->nnc_lock, 1, sizeof(daemon->nnc_lock));
+        memset (&d->nnc_lock, 1, sizeof(daemon->nnc_lock));
 #endif /* MHD_USE_THREADS */
 #endif /* DAUTH_SUPPORT */
 
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 829f225d..26f5d43b 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -2440,8 +2440,6 @@ MHD_check_response_header_token_ci (const struct 
MHD_Response *response,
 void
 internal_suspend_connection_ (struct MHD_Connection *connection);
 
-#endif
-
 
 /**
  * Trace up to and return master daemon. If the supplied daemon
@@ -2463,3 +2461,6 @@ MHD_get_master (struct MHD_Daemon *const daemon)
 
   return ret;
 }
+
+
+#endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.