[GNUnet-SVN] [libmicrohttpd] branch master updated (ec204f59 -> 2715cf26)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from ec204f59 Added support for Solaris-style sendfile
     new 8a462a08 Fixed MSVC build after 
12f65d40ac9a9351b26dc11d7dcd468a531dfe15
     new 2715cf26 Threads initialisation: reduce data race on W32

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/mhd_threads.c | 4 +---
 w32/common/MHD_config.h      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/microhttpd/mhd_threads.c b/src/microhttpd/mhd_threads.c
index 477080cf..21d0ecc7 100644
--- a/src/microhttpd/mhd_threads.c
+++ b/src/microhttpd/mhd_threads.c
@@ -210,7 +210,6 @@ MHD_create_thread_ (MHD_thread_handle_ID_ *thread,
 
   return !res;
 #elif defined(MHD_USE_W32_THREADS)
-  unsigned int thread_ID;
 #if SIZE_MAX != UINT_MAX
   if (stack_size > UINT_MAX)
     {
@@ -225,12 +224,11 @@ MHD_create_thread_ (MHD_thread_handle_ID_ *thread,
                                      start_routine,
                                      arg,
                                      0,
-                                     &thread_ID);
+                                     (unsigned*)&thread->ID);
 
   if ((MHD_thread_handle_)-1 == thread->handle)
     return 0;
 
-  thread->ID = (MHD_thread_ID_)thread_ID;
   return !0;
 #endif
 }
diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index 02d96424..21db7eae 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -13,7 +13,7 @@
 #define INLINE_FUNC 1
 
 /* Define to prefix which will be used with MHD inline functions. */
-#define _MHD_inline static __forceinline
+#define _MHD_static_inline static __forceinline
 
 
 /* *** MHD configuration *** */

-- 
To stop receiving notification emails like this one, please contact
address@hidden