[GNUnet-SVN] r32440 - in libmicrohttpd/src: include microhttpd platform

[gnunet]

Author: Karlson2k
Date: 2014-02-20 08:07:30 +0100 (Thu, 20 Feb 2014)
New Revision: 32440

Modified:
   libmicrohttpd/src/include/platform_interface.h
   libmicrohttpd/src/include/w32functions.h
   libmicrohttpd/src/microhttpd/Makefile.am
   libmicrohttpd/src/platform/Makefile.am
   libmicrohttpd/src/platform/w32functions.c
Log:
w32functions cleanups and makefile fixes for W32

Modified: libmicrohttpd/src/include/platform_interface.h
===================================================================
--- libmicrohttpd/src/include/platform_interface.h      2014-02-19 20:02:24 UTC 
(rev 32439)
+++ libmicrohttpd/src/include/platform_interface.h      2014-02-20 07:07:30 UTC 
(rev 32440)
@@ -136,7 +136,7 @@
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #define MHD_random_() random()
 #else
-#define MHD_random_() MHD_W32_random()
+#define MHD_random_() MHD_W32_random_()
 #endif
 
 #endif // MHD_PLATFORM_INTERFACE_H

Modified: libmicrohttpd/src/include/w32functions.h
===================================================================
--- libmicrohttpd/src/include/w32functions.h    2014-02-19 20:02:24 UTC (rev 
32439)
+++ libmicrohttpd/src/include/w32functions.h    2014-02-20 07:07:30 UTC (rev 
32440)
@@ -182,8 +182,7 @@
  * Function initialize itself at first call to current time.
  * @return 31-bit pseudo random number.
  */
-_MHD_EXTERN int MHD_W32_random(void); /* must be exported for "make check" 
tests */
-                                      /* TODO: exclude from exports */
+int MHD_W32_random_(void);
 
 #ifdef __cplusplus
 }

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2014-02-19 20:02:24 UTC (rev 
32439)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2014-02-20 07:07:30 UTC (rev 
32440)
@@ -5,6 +5,10 @@
 AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \
   @LIBGCRYPT_CFLAGS@
 
+if HAVE_W32
+MHD_W32_LIB = $(top_builddir)/src/platform/libmicrohttpd_w32.la
+endif
+
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
@@ -22,13 +26,9 @@
 libmicrohttpd_la_LDFLAGS = \
   $(MHD_LIB_LDFLAGS) \
   -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
-libmicrohttpd_la_LIBADD =
+libmicrohttpd_la_LIBADD = \
+  $(MHD_W32_LIB)
 
-if HAVE_W32
-libmicrohttpd_la_LIBADD += \
- $(top_builddir)/src/platform/libmicrohttpd_w32.la
-endif
-
 if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
@@ -83,7 +83,8 @@
 test_postprocessor_SOURCES = \
   test_postprocessor.c
 test_postprocessor_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+  $(MHD_W32_LIB)
 
 test_postprocessor_amp_SOURCES = \
   test_postprocessor_amp.c
@@ -93,4 +94,5 @@
 test_postprocessor_large_SOURCES = \
   test_postprocessor_large.c
 test_postprocessor_large_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la \
+  $(MHD_W32_LIB)

Modified: libmicrohttpd/src/platform/Makefile.am
===================================================================
--- libmicrohttpd/src/platform/Makefile.am      2014-02-19 20:02:24 UTC (rev 
32439)
+++ libmicrohttpd/src/platform/Makefile.am      2014-02-20 07:07:30 UTC (rev 
32440)
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
-  -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)/src/microhttpd
+  -I$(top_srcdir)/src/include
 
 AM_CFLAGS = $(HIDDEN_VISIBILITY_CFLAGS) \
   @LIBGCRYPT_CFLAGS@

Modified: libmicrohttpd/src/platform/w32functions.c
===================================================================
--- libmicrohttpd/src/platform/w32functions.c   2014-02-19 20:02:24 UTC (rev 
32439)
+++ libmicrohttpd/src/platform/w32functions.c   2014-02-20 07:07:30 UTC (rev 
32440)
@@ -630,7 +630,7 @@
  * Function initialize itself at first call to current time.
  * @return 31-bit pseudo random number.
  */
-int MHD_W32_random(void)
+int MHD_W32_random_(void)
 {
   if (0 == rnd_val)
     rnd_val = (int32_t)time(NULL);