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

[gnunet]

Author: Karlson2k
Date: 2016-08-23 22:13:14 +0200 (Tue, 23 Aug 2016)
New Revision: 37767

Modified:
   libmicrohttpd/src/microhttpd/connection.c
   libmicrohttpd/src/microhttpd/daemon.c
   libmicrohttpd/src/microhttpd/mhd_sockets.h
Log:
mhd_sockets.h: unify some macro names

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2016-08-23 20:13:10 UTC (rev 
37766)
+++ libmicrohttpd/src/microhttpd/connection.c   2016-08-23 20:13:14 UTC (rev 
37767)
@@ -146,9 +146,9 @@
 {
   int res = MHD_NO;
 #if defined(TCP_CORK) || defined(TCP_NOPUSH)
-  const _MHD_SOCKOPT_BOOL_TYPE on_val = 1;
+  const MHD_SCKT_OPT_BOOL_ on_val = 1;
 #if defined(TCP_NODELAY)
-  const _MHD_SOCKOPT_BOOL_TYPE off_val = 0;
+  const MHD_SCKT_OPT_BOOL_ off_val = 0;
 #endif /* TCP_NODELAY */
   if (!connection)
     return MHD_NO;
@@ -191,9 +191,9 @@
 {
 #if defined(TCP_CORK) || defined(TCP_NOPUSH)
   int res = MHD_YES;
-  const _MHD_SOCKOPT_BOOL_TYPE off_val = 0;
+  const MHD_SCKT_OPT_BOOL_ off_val = 0;
 #if defined(TCP_NODELAY)
-  const _MHD_SOCKOPT_BOOL_TYPE on_val = 1;
+  const MHD_SCKT_OPT_BOOL_ on_val = 1;
 #endif /* TCP_NODELAY */
 #if !defined(TCP_CORK)
   const int dummy = 0;
@@ -237,9 +237,9 @@
 {
 #if defined(TCP_NODELAY)
   int res = MHD_YES;
-  const _MHD_SOCKOPT_BOOL_TYPE on_val = 1;
+  const MHD_SCKT_OPT_BOOL_ on_val = 1;
 #if defined(TCP_CORK) || defined(TCP_NOPUSH)
-  const _MHD_SOCKOPT_BOOL_TYPE off_val = 0;
+  const MHD_SCKT_OPT_BOOL_ off_val = 0;
 #endif /* TCP_CORK || TCP_NOPUSH */
   if (!connection)
     return MHD_NO;
@@ -276,9 +276,9 @@
 {
 #if defined(TCP_NODELAY)
   int res = MHD_YES;
-  const _MHD_SOCKOPT_BOOL_TYPE off_val = 0;
+  const MHD_SCKT_OPT_BOOL_ off_val = 0;
 #if defined(TCP_CORK)
-  _MHD_SOCKOPT_BOOL_TYPE cork_val = 0;
+  MHD_SCKT_OPT_BOOL_ cork_val = 0;
   socklen_t param_size = sizeof (cork_val);
 #endif /* TCP_CORK */
   if (!connection)

Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c       2016-08-23 20:13:10 UTC (rev 
37766)
+++ libmicrohttpd/src/microhttpd/daemon.c       2016-08-23 20:13:14 UTC (rev 
37767)
@@ -1131,7 +1131,7 @@
 
   ret = (ssize_t) recv (connection->socket_fd,
                         other,
-                        (_MHD_socket_funcs_size) i,
+                        (MHD_SCKT_SEND_SIZE_) i,
                         MSG_NOSIGNAL);
 #if EPOLL_SUPPORT
   if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_ (MHD_socket_get_error_ ())) )
@@ -1180,7 +1180,7 @@
   if (0 != (connection->daemon->options & MHD_USE_SSL))
     return (ssize_t) send (connection->socket_fd,
                            other,
-                           (_MHD_socket_funcs_size) i,
+                           (MHD_SCKT_SEND_SIZE_) i,
                            MSG_NOSIGNAL);
 #if LINUX
   if ( (connection->write_buffer_append_offset ==
@@ -1232,7 +1232,7 @@
         http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html 
*/
     }
 #endif
-  ret = (ssize_t) send (connection->socket_fd, other, 
(_MHD_socket_funcs_size)i, MSG_NOSIGNAL);
+  ret = (ssize_t) send (connection->socket_fd, other, (MHD_SCKT_SEND_SIZE_)i, 
MSG_NOSIGNAL);
   err = MHD_socket_get_error_();
 #if EPOLL_SUPPORT
   if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_(err)) )
@@ -3667,7 +3667,7 @@
                      MHD_AccessHandlerCallback dh, void *dh_cls,
                     va_list ap)
 {
-  const _MHD_SOCKOPT_BOOL_TYPE on = 1;
+  const MHD_SCKT_OPT_BOOL_ on = 1;
   struct MHD_Daemon *daemon;
   MHD_socket socket_fd;
   struct sockaddr_in servaddr4;
@@ -4056,7 +4056,7 @@
             
(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... */
-         const _MHD_SOCKOPT_BOOL_TYPE v6_only =
+         const MHD_SCKT_OPT_BOOL_ v6_only =
             (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK));
          if (0 > setsockopt (socket_fd,
                               IPPROTO_IPV6, IPV6_V6ONLY,

Modified: libmicrohttpd/src/microhttpd/mhd_sockets.h
===================================================================
--- libmicrohttpd/src/microhttpd/mhd_sockets.h  2016-08-23 20:13:10 UTC (rev 
37766)
+++ libmicrohttpd/src/microhttpd/mhd_sockets.h  2016-08-23 20:13:14 UTC (rev 
37767)
@@ -171,22 +171,22 @@
 
 
 /**
- * _MHD_SOCKOPT_BOOL_TYPE is type for bool parameters for 
setsockopt()/getsockopt()
+ * MHD_SCKT_OPT_BOOL_ is type for bool parameters for setsockopt()/getsockopt()
  */
 #ifdef MHD_POSIX_SOCKETS
-  typedef int _MHD_SOCKOPT_BOOL_TYPE;
+  typedef int MHD_SCKT_OPT_BOOL_;
 #else /* MHD_WINSOCK_SOCKETS */
-  typedef BOOL _MHD_SOCKOPT_BOOL_TYPE;
+  typedef BOOL MHD_SCKT_OPT_BOOL_;
 #endif /* MHD_WINSOCK_SOCKETS */
 
 /**
- * _MHD_socket_funcs_size is type used to specify size for send and recv
+ * MHD_SCKT_SEND_SIZE_ is type used to specify size for send and recv
  * functions
  */
 #if !defined(MHD_WINSOCK_SOCKETS)
-  typedef size_t _MHD_socket_funcs_size;
+  typedef size_t MHD_SCKT_SEND_SIZE_;
 #else
-  typedef int _MHD_socket_funcs_size;
+  typedef int MHD_SCKT_SEND_SIZE_;
 #endif
 
 /**