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

[gnunet]

Author: Karlson2k
Date: 2015-11-21 20:43:06 +0100 (Sat, 21 Nov 2015)
New Revision: 36682

Modified:
   libmicrohttpd/src/include/platform.h
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/microhttpd/daemon.c
Log:
Add and use _MHD_SOCKOPT_BOOL_TYPE for simplify usage of setsockopt() on 
W32/POSIX sockets.

Modified: libmicrohttpd/src/include/platform.h
===================================================================
--- libmicrohttpd/src/include/platform.h        2015-11-21 17:26:01 UTC (rev 
36681)
+++ libmicrohttpd/src/include/platform.h        2015-11-21 19:43:06 UTC (rev 
36682)
@@ -189,6 +189,15 @@
 #define MHD_SOCKET_DEFINED 1
 #endif /* MHD_SOCKET_DEFINED */
 
+/**
+ * _MHD_SOCKOPT_BOOL_TYPE is type for bool parameters for 
setsockopt()/getsockopt()
+ */
+#ifdef MHD_POSIX_SOCKETS
+typedef int _MHD_SOCKOPT_BOOL_TYPE;
+#else /* MHD_WINSOCK_SOCKETS */
+typedef BOOL _MHD_SOCKOPT_BOOL_TYPE;
+#endif /* MHD_WINSOCK_SOCKETS */
+
 #ifndef _WIN32
 typedef time_t _MHD_TIMEVAL_TV_SEC_TYPE;
 #else  /* _WIN32 */

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2015-11-21 17:26:01 UTC (rev 
36681)
+++ libmicrohttpd/src/microhttpd/connection.c   2015-11-21 19:43:06 UTC (rev 
36682)
@@ -2425,7 +2425,7 @@
 #if HAVE_DECL_TCP_CORK
           /* starting header send, set TCP cork */
           {
-            const int val = 1;
+            const _MHD_SOCKOPT_BOOL_TYPE val = 1;
             setsockopt (connection->socket_fd, IPPROTO_TCP, TCP_CORK, &val,
                         sizeof (val));
           }
@@ -2509,7 +2509,7 @@
 #if HAVE_DECL_TCP_CORK
           /* done sending, uncork */
           {
-            const int val = 0;
+            const _MHD_SOCKOPT_BOOL_TYPE = 0;
             setsockopt (connection->socket_fd, IPPROTO_TCP, TCP_CORK, &val,
                         sizeof (val));
           }

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2015-11-21 17:26:01 UTC (rev 
36681)
+++ libmicrohttpd/src/microhttpd/daemon.c       2015-11-21 19:43:06 UTC (rev 
36682)
@@ -3619,11 +3619,7 @@
                      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 */
+  const _MHD_SOCKOPT_BOOL_TYPE on = 1;
   struct MHD_Daemon *daemon;
   MHD_socket socket_fd;
   struct sockaddr_in servaddr4;
@@ -3995,12 +3991,8 @@
             
(http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx);
             and may also be missing on older POSIX systems; good luck if you 
have any of those,
             your IPv6 socket may then also bind against IPv4 anyway... */
-#ifndef MHD_WINSOCK_SOCKETS
-         const int
-#else
-         const uint32_t
-#endif
-            v6_only = (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
+         const _MHD_SOCKOPT_BOOL_TYPE v6_only =
+            (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
          if (0 > setsockopt (socket_fd,
                               IPPROTO_IPV6, IPV6_V6ONLY,
                               (const void*)&v6_only, sizeof (v6_only)))