[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 4e4a1ce2bb9f6cd1d38fdc5f169d8956afab70c0

[gitolite]

The branch, master has been updated
       via  4e4a1ce2bb9f6cd1d38fdc5f169d8956afab70c0 (commit)
      from  24725d33d9074b880b7f993165dd408153004862 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4e4a1ce2bb9f6cd1d38fdc5f169d8956afab70c0
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date:   Mon Nov 7 21:31:42 2016 +0300

    Fixed calloc() substitution.

-----------------------------------------------------------------------

Summary of changes:
 src/microhttpd/Makefile.am | 6 +-----
 w32/common/MHD_config.h    | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index cc48d11..1ab0474 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -68,12 +68,8 @@ libmicrohttpd_la_SOURCES = \
   mhd_locks.h \
   mhd_sockets.c mhd_sockets.h \
   mhd_itc.c mhd_itc.h mhd_itc_types.h \
-  mhd_compat.h \
+  mhd_compat.c mhd_compat.h \
   response.c response.h
-if HAVE_W32
-libmicrohttpd_la_SOURCES += \
-  mhd_compat.c
-endif
 
 libmicrohttpd_la_CPPFLAGS = \
   $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
diff --git a/w32/common/MHD_config.h b/w32/common/MHD_config.h
index bfa7ce8..0101756 100644
--- a/w32/common/MHD_config.h
+++ b/w32/common/MHD_config.h
@@ -74,6 +74,9 @@
 /* Define to 1 if you have the `gmtime_s' function in W32 form. */
 #define HAVE_W32_GMTIME_S 1
 
+/* Define to 1 if you have the usable `calloc' function. */
+#define HAVE_CALLOC 1
+
 #if _MSC_VER >= 1900 /* snprintf() supported natively since VS2015 */
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1


hooks/post-receive
-- 
GNU libmicrohttpd