Fixed calloc() substitution.

2 files changed, 4 insertions, 5 deletions

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index cc48d11d..1ab04741 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 bfa7ce8d..0101756a 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