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

[gnunet]

Author: Karlson2k
Date: 2015-09-06 18:02:07 +0200 (Sun, 06 Sep 2015)
New Revision: 36341

Modified:
   libmicrohttpd/src/microhttpd/daemon.c
Log:
daemon.c: use correct type for setsockopt() on W32, do not use same var name 
for nested branches

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-09-06 16:02:05 UTC (rev 
36340)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-09-06 16:02:07 UTC (rev 
36341)
@@ -3617,7 +3617,11 @@
                      MHD_AccessHandlerCallback dh, void *dh_cls,
                     va_list ap)
 {
+#if defined(MHD_POSIX_SOCKETS)
   const int on = 1;
+#elif defined(MHD_WINSOCK_SOCKETS)
+  const uint32_t on = 1;
+#endif /* MHD_WINSOCK_SOCKETS */
   struct MHD_Daemon *daemon;
   MHD_socket socket_fd;
   struct sockaddr_in servaddr4;
@@ -3992,12 +3996,12 @@
 #ifndef MHD_WINSOCK_SOCKETS
          const int
 #else
-         const char
+         const uint32_t
 #endif
-            on = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
+            v6_only = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
          if (0 > setsockopt (socket_fd,
                               IPPROTO_IPV6, IPV6_V6ONLY,
-                              &on, sizeof (on)))
+                              &v6_only, sizeof (v6_only)))
       {
 #if HAVE_MESSAGES
             MHD_DLOG (daemon,