[GNUnet-SVN] r37885 - libmicrohttpd/src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-09-05 13:55:01 +0200 (Mon, 05 Sep 2016)
New Revision: 37885

Modified:
   libmicrohttpd/src/microhttpd/Makefile.am
   libmicrohttpd/src/microhttpd/mhd_compat.c
Log:
-dummy function also creates warning, simply only include file on W32

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2016-09-05 01:59:35 UTC (rev 
37884)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2016-09-05 11:55:01 UTC (rev 
37885)
@@ -68,8 +68,13 @@
   mhd_locks.h mhd_sem.c \
   mhd_sockets.c mhd_sockets.h \
   mhd_itc.c mhd_itc.h \
-  mhd_compat.c mhd_compat.h \
+  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) \
   -DBUILDING_MHD_LIB=1

Modified: libmicrohttpd/src/microhttpd/mhd_compat.c
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_compat.c   2016-09-05 01:59:35 UTC (rev 
37884)
+++ libmicrohttpd/src/microhttpd/mhd_compat.c   2016-09-05 11:55:01 UTC (rev 
37885)
@@ -35,21 +35,15 @@
 #endif /* _WIN32  && !__CYGWIN__ */
 
 
-/**
- * Dummy function to silent compiler warning on empty file
- * @return zero
- */
-static int
-static_dummy_func(void)
-{
-  return 0;
-}
-
 #if defined(_WIN32) && !defined(__CYGWIN__)
 
 #ifndef HAVE_SNPRINTF
 /* Emulate snprintf function on W32 */
-int W32_snprintf(char *__restrict s, size_t n, const char *__restrict format, 
...)
+int
+W32_snprintf(char *__restrict s,
+             size_t n,
+             const char *__restrict format,
+             ...)
 {
   int ret;
   va_list args;