libmicrohttpd

commit 9613a64e3bcbe0e90939a86b2cfa8cf2e3ddea5b
parent 7aa3e9a819c8da4971e68e361070cbb81a7e9b2e
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Sun,  6 Sep 2015 16:02:07 +0000

daemon.c: use correct type for setsockopt() on W32, do not use same var name for nested branches

Diffstat:
M
src/microhttpd/daemon.c
 | 
10
+++++++---

1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -3617,7 +3617,11 @@ MHD_start_daemon_va (unsigned int flags,
                      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 @@ MHD_start_daemon_va (unsigned int flags,
 #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,