Renamed sockets kind macros

m4/mhd_shutdown_socket_trigger.m4

@@ -109,14 +109,14 @@ AC_DEFUN([_MHD_RUN_CHECK_SOCKET_SHUTDOWN_TRIGGER],[dnl
 #  endif
    typedef int MHD_Socket;
 #  define MHD_INVALID_SOCKET (-1)
-#  define MHD_POSIX_SOCKETS 1
+#  define MHD_SOCKETS_KIND_POSIX 1
 #else
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #  include <windows.h>
    typedef SOCKET MHD_Socket;
 #  define MHD_INVALID_SOCKET (INVALID_SOCKET)
-#  define MHD_WINSOCK_SOCKETS 1
+#  define MHD_SOCKETS_KIND_WINSOCK 1
 #endif
 
 #include <pthread.h>
@@ -201,7 +201,7 @@ static MHD_Socket create_socket(void)
 
 static void close_socket(MHD_Socket fd)
 {
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
   close(fd);
 #else
   closesocket(fd);
@@ -333,7 +333,7 @@ static int test_it(void)
 
 static int init(void)
 {
-#ifdef MHD_WINSOCK_SOCKETS
+#ifdef MHD_SOCKETS_KIND_WINSOCK
   WSADATA wsa_data;
 
   if (0 != WSAStartup(MAKEWORD(2, 2), &wsa_data) || MAKEWORD(2, 2) != wsa_data.wVersion)
@@ -341,15 +341,15 @@ static int init(void)
       WSACleanup();
       return 0;
     }
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
   return 1;
 }
 
 static void cleanup(void)
 {
-#ifdef MHD_WINSOCK_SOCKETS
+#ifdef MHD_SOCKETS_KIND_WINSOCK
   WSACleanup();
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 }
 
 int main(void)

src/include/microhttpd2_portability.h

@@ -68,11 +68,11 @@ MHD_C_DECLRATIONS_START_HERE_
  * MHD_Socket is type for socket FDs
  */
 #  if ! defined(_WIN32) || defined(_SYS_TYPES_FD_SET)
-#    define MHD_POSIX_SOCKETS 1
+#    define MHD_SOCKETS_KIND_POSIX 1
 typedef int MHD_Socket;
 #    define MHD_INVALID_SOCKET (-1)
 #  else /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */
-#    define MHD_WINSOCK_SOCKETS 1
+#    define MHD_SOCKETS_KIND_WINSOCK 1
 typedef SOCKET MHD_Socket;
 #    define MHD_INVALID_SOCKET (INVALID_SOCKET)
 #  endif /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */

src/mhd2/daemon_add_conn.c

@@ -604,11 +604,11 @@ MHD_daemon_add_connection (struct MHD_Daemon *daemon,
   else
     sk_nonbl = true;
 
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
   sk_spipe_supprs = false;
-#else  /* MHD_WINSOCK_SOCKETS */
+#else  /* MHD_SOCKETS_KIND_WINSOCK */
   sk_spipe_supprs = true; /* Nothing to suppress on W32 */
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 #if defined(MHD_socket_nosignal_)
   if (! sk_spipe_supprs)
     sk_spipe_supprs = MHD_socket_nosignal_ (client_socket);
@@ -652,7 +652,7 @@ MHD_daemon_add_connection (struct MHD_Daemon *daemon,
        socket as the initial offset into the pool for load
        balancing */
     unsigned int offset;
-#ifdef MHD_WINSOCK_SOCKETS
+#ifdef MHD_SOCKETS_KIND_WINSOCK
     uint_fast64_t osb = (uint_fast64_t) client_socket;
     osb ^= (((uint_fast64_t) client_socket) >> 9);
     osb ^= (((uint_fast64_t) client_socket) >> 18);
@@ -752,11 +752,11 @@ mhd_daemon_accept_connection (struct MHD_Daemon *restrict daemon)
                      | SOCK_NOSIGPIPE_OR_ZERO))))
   {
     sk_nonbl = (SOCK_NONBLOCK_OR_ZERO != 0);
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
     sk_spipe_supprs = (SOCK_NOSIGPIPE_OR_ZERO != 0);
-#else  /* MHD_WINSOCK_SOCKETS */
+#else  /* MHD_SOCKETS_KIND_WINSOCK */
     sk_spipe_supprs = true; /* Nothing to suppress on W32 */
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
     sk_cloexec = (SOCK_CLOEXEC_OR_ZERO != 0);
   }
 #endif /* USE_ACCEPT4 */
@@ -772,11 +772,11 @@ mhd_daemon_accept_connection (struct MHD_Daemon *restrict daemon)
 #else  /* ! MHD_ACCEPT_INHERIT_NONBLOCK */
     sk_nonbl = false;
 #endif /* ! MHD_ACCEPT_INHERIT_NONBLOCK */
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
     sk_spipe_supprs = false;
-#else  /* MHD_WINSOCK_SOCKETS */
+#else  /* MHD_SOCKETS_KIND_WINSOCK */
     sk_spipe_supprs = true; /* Nothing to suppress on W32 */
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
     sk_cloexec = false;
   }
 #endif /* _DEBUG || !USE_ACCEPT4 */

src/mhd2/daemon_start.c

@@ -35,14 +35,14 @@
 #include "mhd_sockets_macros.h"
 #include "sys_ip_headers.h"
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  include "sys_errno.h"
 #endif
 #ifdef MHD_USE_EPOLL
 #  include <sys/epoll.h>
 #endif
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  include <fcntl.h>
 #  ifdef MHD_USE_SELECT
 #    ifdef HAVE_SYS_SELECT_H
@@ -611,13 +611,13 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
   if (MHD_INVALID_SOCKET == sk)
   {
     mhd_assert (NULL != p_use_sa);
-#if defined(MHD_WINSOCK_SOCKETS) && defined(WSA_FLAG_NO_HANDLE_INHERIT)
+#if defined(MHD_SOCKETS_KIND_WINSOCK) && defined(WSA_FLAG_NO_HANDLE_INHERIT)
     /* May fail before Win7 SP1 */
     sk = WSASocketW (p_use_sa->sa_family, SOCK_STREAM, 0,
                      NULL, 0, WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
 
     if (MHD_INVALID_SOCKET == sk)
-#endif /* MHD_WINSOCK_SOCKETS && WSA_FLAG_NO_HANDLE_INHERIT */
+#endif /* MHD_SOCKETS_KIND_WINSOCK && WSA_FLAG_NO_HANDLE_INHERIT */
     sk = socket (p_use_sa->sa_family,
                  SOCK_STREAM | mhd_SOCK_NONBLOCK
                  | mhd_SOCK_CLOEXEC | mhd_SOCK_NOSIGPIPE, 0);
@@ -808,7 +808,7 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
 
       if (MHD_D_OPTION_BIND_TYPE_NOT_SHARED >= d->settings->listen_addr_reuse)
       {
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
 #ifdef SO_REUSEADDR
         mhd_SCKT_OPT_BOOL on_val1 = 1;
         if (0 != setsockopt (sk, SOL_SOCKET, SO_REUSEADDR,
@@ -822,17 +822,17 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
         mhd_LOG_MSG (d, MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_NOT_SUPPORTED, \
                      "The OS does not support address reuse for sockets");
 #endif /* ! SO_REUSEADDR */
-#endif /* ! MHD_WINSOCK_SOCKETS */
+#endif /* ! MHD_SOCKETS_KIND_WINSOCK */
         if (MHD_D_OPTION_BIND_TYPE_NOT_SHARED > d->settings->listen_addr_reuse)
         {
-#if defined(SO_REUSEPORT) || defined(MHD_WINSOCK_SOCKETS)
+#if defined(SO_REUSEPORT) || defined(MHD_SOCKETS_KIND_WINSOCK)
           mhd_SCKT_OPT_BOOL on_val2 = 1;
           if (0 != setsockopt (sk, SOL_SOCKET,
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
                                SO_REUSEPORT,
-#else  /* ! MHD_WINSOCK_SOCKETS */
+#else  /* ! MHD_SOCKETS_KIND_WINSOCK */
                                SO_REUSEADDR, /* On W32 it is the same as SO_REUSEPORT on other platforms */
-#endif /* ! MHD_WINSOCK_SOCKETS */
+#endif /* ! MHD_SOCKETS_KIND_WINSOCK */
                                (const void *) &on_val2, sizeof (on_val2)))
           {
             mhd_LOG_MSG (d, MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_FAILED, \
@@ -841,12 +841,12 @@ create_bind_listen_stream_socket (struct MHD_Daemon *restrict d,
             ret = MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_FAILED;
             break;
           }
-#else  /* ! SO_REUSEADDR && ! MHD_WINSOCK_SOCKETS */
+#else  /* ! SO_REUSEADDR && ! MHD_SOCKETS_KIND_WINSOCK */
           mhd_LOG_MSG (d, MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_NOT_SUPPORTED, \
                        "The OS does not support address sharing for sockets");
           ret = MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_NOT_SUPPORTED;
           break;
-#endif /* ! SO_REUSEADDR && ! MHD_WINSOCK_SOCKETS */
+#endif /* ! SO_REUSEADDR && ! MHD_SOCKETS_KIND_WINSOCK */
         }
       }
 #if defined(SO_EXCLUSIVEADDRUSE) || defined(SO_EXCLBIND)
@@ -1329,9 +1329,9 @@ daemon_init_net (struct MHD_Daemon *restrict d,
 
   mhd_assert (! d->dbg.net_inited);
   mhd_assert (! d->dbg.net_deinited);
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
   d->net.cfg.max_fd_num = s->fd_number_limit;
-#endif /* MHD_POSIX_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_POSIX */
 
   ret = daemon_choose_and_preinit_events (d, s);
   if (MHD_SC_OK != ret)
@@ -1342,14 +1342,14 @@ daemon_init_net (struct MHD_Daemon *restrict d,
   /* No direct return of error codes is allowed beyond this point.
      Deinit/cleanup must be performed before return of any error. */
 
-#if defined(MHD_POSIX_SOCKETS) && defined(MHD_USE_SELECT)
+#if defined(MHD_SOCKETS_KIND_POSIX) && defined(MHD_USE_SELECT)
   if (mhd_POLL_TYPE_SELECT == d->events.poll_type)
   {
     if ((MHD_INVALID_SOCKET == d->net.cfg.max_fd_num) ||
         (FD_SETSIZE < d->net.cfg.max_fd_num))
       d->net.cfg.max_fd_num = FD_SETSIZE;
   }
-#endif /* MHD_POSIX_SOCKETS && MHD_USE_SELECT */
+#endif /* MHD_SOCKETS_KIND_POSIX && MHD_USE_SELECT */
 
   if (MHD_SC_OK == ret)
   {
@@ -2071,7 +2071,7 @@ set_connections_total_limits (struct MHD_Daemon *restrict d,
   limit_by_select = UINT_MAX;
 
   error_by_fd_setsize = false;
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
   if (1)
   {
     limit_by_num = (unsigned int) d->net.cfg.max_fd_num;
@@ -2107,7 +2107,7 @@ set_connections_total_limits (struct MHD_Daemon *restrict d,
     else
       limit_by_num = (unsigned int) INT_MAX;
   }
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   if (1)
   {
 #ifdef MHD_USE_SELECT
@@ -2135,7 +2135,7 @@ set_connections_total_limits (struct MHD_Daemon *restrict d,
 #endif /* MHD_USE_SELECT */
     (void) 0; /* Mute compiler warning */
   }
-#endif /* MHD_POSIX_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_POSIX */
   if (error_by_fd_setsize)
   {
     mhd_LOG_MSG ( \
@@ -2154,7 +2154,7 @@ set_connections_total_limits (struct MHD_Daemon *restrict d,
   {
     /* No user configuration provided */
     unsigned int suggested_limit;
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
 #define TYPICAL_NOFILES_LIMIT (1024)  /* The usual limit for the number of open FDs */
     suggested_limit = TYPICAL_NOFILES_LIMIT;
     suggested_limit -= 3; /* The numbers zero, one and two are used typically */
@@ -2165,13 +2165,13 @@ set_connections_total_limits (struct MHD_Daemon *restrict d,
       --suggested_limit; /* One FD is used for the listening socket */
     if (suggested_limit > TYPICAL_NOFILES_LIMIT)
       suggested_limit = 0; /* Overflow */
-#else  /* MHD_WINSOCK_SOCKETS */
+#else  /* MHD_SOCKETS_KIND_WINSOCK */
 #ifdef _WIN64
     suggested_limit = 2048;
 #else
     suggested_limit = 1024;
 #endif
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
     if (suggested_limit < num_worker_daemons)
     {
       /* Use at least one connection for every worker daemon and

src/mhd2/events_process.c

@@ -35,7 +35,7 @@
 #ifdef MHD_USE_EPOLL
 #  include <sys/epoll.h>
 #endif
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  include "sys_errno.h"
 #endif
 
@@ -389,11 +389,11 @@ fd_set_wrap (MHD_Socket fd,
                                               it is added */
   mhd_assert (mhd_POLL_TYPE_SELECT == d->events.poll_type);
   (void) d; /* Unused with non-debug builds */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
   FD_SET (fd, fs);
   if (*max < fd)
     *max = fd;
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   /* Use custom set function to take advantage of know uniqueness of
    * used sockets (to skip useless (for this function) check for duplicated
    * sockets implemented in system's macro). */
@@ -622,16 +622,16 @@ get_all_net_updates_by_select (struct MHD_Daemon *restrict d,
 
   max_wait = get_max_wait (d); // TODO: use correct timeout value
 
-#ifdef MHD_WINSOCK_SOCKETS
+#ifdef MHD_SOCKETS_KIND_WINSOCK
   if (0 == max_socket)
   {
     Sleep ((unsigned int) max_wait);
     return true;
   }
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 
   tmvl.tv_sec = max_wait / 1000;
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
   tmvl.tv_usec = (uint_least16_t) ((max_wait % 1000) * 1000);
 #else
   tmvl.tv_usec = (int) ((max_wait % 1000) * 1000);
@@ -650,7 +650,7 @@ get_all_net_updates_by_select (struct MHD_Daemon *restrict d,
     bool is_ignored_error;
     is_hard_error = false;
     is_ignored_error = false;
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
     err = errno;
     if (0 != err)
     {
@@ -658,7 +658,7 @@ get_all_net_updates_by_select (struct MHD_Daemon *restrict d,
         ((mhd_EBADF_OR_ZERO == err) || (mhd_EINVAL_OR_ZERO == err));
       is_ignored_error = (mhd_EINTR_OR_ZERO == err);
     }
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
     err = WSAGetLastError ();
     is_hard_error =
       ((WSAENETDOWN == err) || (WSAEFAULT == err) || (WSAEINVAL == err) ||
@@ -904,7 +904,7 @@ get_all_net_updates_by_poll (struct MHD_Daemon *restrict d,
     bool is_ignored_error;
     is_hard_error = false;
     is_ignored_error = false;
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
     err = errno;
     if (0 != err)
     {
@@ -912,7 +912,7 @@ get_all_net_updates_by_poll (struct MHD_Daemon *restrict d,
         ((mhd_EFAULT_OR_ZERO == err) || (mhd_EINVAL_OR_ZERO == err));
       is_ignored_error = (mhd_EINTR_OR_ZERO == err);
     }
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
     err = WSAGetLastError ();
     is_hard_error =
       ((WSAENETDOWN == err) || (WSAEFAULT == err) || (WSAEINVAL == err));

src/mhd2/mhd_connection.h

@@ -619,7 +619,7 @@ struct MHD_Connection
    */
   bool sk_spipe_suppress;
 
-// #ifndef MHD_WINSOCK_SOCKETS // TODO: conditionally use in the code
+// #ifndef MHD_SOCKETS_KIND_WINSOCK // TODO: conditionally use in the code
   /**
    * Tracks TCP_CORK / TCP_NOPUSH of the connection socket.
    */

src/mhd2/mhd_daemon.h

@@ -461,7 +461,7 @@ struct mhd_ListenSocket
  */
 struct mhd_DaemonNetworkSettings
 {
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
   /**
    * The maximum number for the network FDs.
    * The valid FD number must be less then @a max_fd_num.
@@ -959,7 +959,7 @@ struct MHD_Daemon
 };
 
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 /**
  * Checks whether @a fd socket number fits limitations for the @a d_ptr daemon
  */

src/mhd2/mhd_iovec.h

@@ -50,7 +50,7 @@
 
 #include "mhd_limits.h"
 
-#if defined(MHD_WINSOCK_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_WINSOCK)
 /**
  * Internally used I/O vector type for use with winsock.
  * Binary matches system "WSABUF".

src/mhd2/mhd_itc.c

@@ -29,7 +29,7 @@
 #if defined(MHD_ITC_PIPE_)
 #  ifdef MHD_HAVE_MHD_ITC_NONBLOCKING
 #    include "mhd_sockets_funcs.h"
-#    ifndef MHD_POSIX_SOCKETS
+#    ifndef MHD_SOCKETS_KIND_POSIX
 #error Pipe-based ITC can be used only with POSIX sockets
 #    endif
 

src/mhd2/mhd_lib_init.c

@@ -29,7 +29,7 @@
 #include "mhd_mono_clock.h"
 #include "mhd_socket_type.h"
 #include "mhd_send.h"
-#ifdef MHD_WINSOCK_SOCKETS
+#ifdef MHD_SOCKETS_KIND_WINSOCK
 #  include <winsock2.h>
 #endif
 
@@ -38,7 +38,7 @@ mhd_lib_global_init (void)
 {
   mhd_panic_init_default ();
 
-#if defined(MHD_WINSOCK_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_WINSOCK)
   if (1)
   {
     WSADATA wsd;
@@ -46,7 +46,7 @@ mhd_lib_global_init (void)
                                                       wVersion))
       MHD_PANIC ("Failed to initialise WinSock.");
   }
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
   MHD_monotonic_msec_counter_init();
   mhd_send_init_static_vars();
 }
@@ -56,9 +56,9 @@ void
 mhd_lib_global_deinit (void)
 {
   MHD_monotonic_msec_counter_finish();
-#if defined(MHD_WINSOCK_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_WINSOCK)
   (void) WSACleanup ();
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 }
 
 

src/mhd2/mhd_send.c

@@ -71,9 +71,9 @@
 #include "mhd_limits.h"
 
 #if defined(HAVE_SENDMSG) || defined(HAVE_WRITEV) || \
-  defined(MHD_WINSOCK_SOCKETS)
+  defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_USE_VECT_SEND 1
-#endif /* HAVE_SENDMSG || HAVE_WRITEV || MHD_WINSOCK_SOCKETS */
+#endif /* HAVE_SENDMSG || HAVE_WRITEV || MHD_SOCKETS_KIND_WINSOCK */
 
 
 #ifdef mhd_USE_VECT_SEND
@@ -1365,15 +1365,15 @@ send_iov_nontls (struct MHD_Connection *restrict connection,
 {
   bool send_error;
   size_t items_to_send;
-#ifndef MHD_WINSOCK_SOCKETS
+#ifndef MHD_SOCKETS_KIND_WINSOCK
   ssize_t res;
 #endif
 #ifdef HAVE_SENDMSG
   struct msghdr msg;
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   DWORD bytes_sent;
   DWORD cnt_w;
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 
   // TODO: assert for non-TLS
 
@@ -1417,7 +1417,7 @@ send_iov_nontls (struct MHD_Connection *restrict connection,
     *sent = (size_t) res;
   else
     send_error = true;
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #ifdef _WIN64
   if (items_to_send > ULONG_MAX)
   {
@@ -1437,7 +1437,7 @@ send_iov_nontls (struct MHD_Connection *restrict connection,
     *sent = (size_t) bytes_sent;
   else
     send_error = true;
-#else /* !HAVE_SENDMSG && !HAVE_WRITEV && !MHD_WINSOCK_SOCKETS */
+#else /* !HAVE_SENDMSG && !HAVE_WRITEV && !MHD_SOCKETS_KIND_WINSOCK */
 #error No vector-send function available
 #endif
 

src/mhd2/mhd_socket_type.h

@@ -33,7 +33,7 @@
 
 #ifndef MHD_INVALID_SOCKET
 #  if ! defined(_WIN32) || defined(_SYS_TYPES_FD_SET)
-#    define MHD_POSIX_SOCKETS 1 /* The POSIX-style sockets are used */
+#    define MHD_SOCKETS_KIND_POSIX 1 /* The POSIX-style sockets are used */
 /**
  * MHD_Socket is type for socket FDs
  *
@@ -45,7 +45,7 @@ typedef int MHD_Socket;
  */
 #    define MHD_INVALID_SOCKET (-1)
 #  else /* !defined(_WIN32) || defined(_SYS_TYPES_FD_SET) */
-#    define MHD_WINSOCK_SOCKETS 1 /* The WinSock-style sockets are used */
+#    define MHD_SOCKETS_KIND_WINSOCK 1 /* The WinSock-style sockets are used */
 #    include <winsock2.h>
 /**
  * MHD_Socket is type for socket FDs

src/mhd2/mhd_sockets_funcs.c

@@ -28,7 +28,7 @@
 #include "mhd_sockets_funcs.h"
 #include "sys_sockets_headers.h"
 #include "sys_ip_headers.h"
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
 #  endif
@@ -38,7 +38,7 @@
 #    include <stdlib.h>
 #  endif
 #  include <fcntl.h>
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  include <windows.h>
 #endif
 #ifndef INADDR_LOOPBACK
@@ -51,7 +51,7 @@
 MHD_INTERNAL bool
 mhd_socket_nonblocking (MHD_Socket sckt)
 {
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
   // TODO: detect constants in configure
 #if defined(F_GETFL) && defined(O_NONBLOCK) && defined(F_SETFL)
   int get_flags;
@@ -68,12 +68,12 @@ mhd_socket_nonblocking (MHD_Socket sckt)
   if (-1 != fcntl (sckt, F_SETFL, set_flags))
     return true;
 #endif /* F_GETFL && O_NONBLOCK && F_SETFL */
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   unsigned long set_flag = 1;
 
   if (0 == ioctlsocket (sckt, (long) FIONBIO, &set_flag))
     return true;
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 
   return false;
 }
@@ -82,7 +82,7 @@ mhd_socket_nonblocking (MHD_Socket sckt)
 MHD_INTERNAL bool
 mhd_socket_noninheritable (MHD_Socket sckt)
 {
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
   // TODO: detect constants in configure
 #if defined(F_GETFD) && defined(FD_CLOEXEC) && defined(F_SETFD)
   int get_flags;
@@ -99,10 +99,10 @@ mhd_socket_noninheritable (MHD_Socket sckt)
   if (-1 != fcntl (sckt, F_SETFD, set_flags))
     return true;
 #endif /* F_GETFD && FD_CLOEXEC && F_SETFD */
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   if (SetHandleInformation ((HANDLE) sckt, HANDLE_FLAG_INHERIT, 0))
     return true;
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
   return false;
 }
 
@@ -163,7 +163,7 @@ mhd_socket_shut_wr (MHD_Socket sckt)
 static bool
 mhd_socket_blocking (MHD_Socket sckt)
 {
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
   // TODO: detect constants in configure
 #if defined(F_GETFL) && defined(O_NONBLOCK) && defined(F_SETFL)
   int get_flags;
@@ -180,12 +180,12 @@ mhd_socket_blocking (MHD_Socket sckt)
   if (-1 != fcntl (sckt, F_SETFL, set_flags))
     return true;
 #endif /* F_GETFL && O_NONBLOCK && F_SETFL */
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
   unsigned long set_flag = 0;
 
   if (0 == ioctlsocket (sckt, (long) FIONBIO, &set_flag))
     return true;
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 
   return false;
 }

src/mhd2/mhd_sockets_macros.h

@@ -33,7 +33,7 @@
 #include "sys_base_types.h"
 #include "sys_sockets_headers.h"
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  include "sys_errno.h"
 #  ifdef HAVE_UNISTD_H
 #    include <unistd.h>
@@ -41,7 +41,7 @@
 #    include <stdlib.h>
 #  endif
 #  include "sys_errno.h"
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  include <winsock2.h>
 #endif
 
@@ -49,9 +49,9 @@
  * Close the socket FD
  * @param sckt the socket to close
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  define mhd_socket_close(sckt) close (sckt)
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_socket_close(sckt) closesocket (sckt)
 #endif
 
@@ -91,22 +91,22 @@
 /**
  * Last socket error
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  define mhd_SCKT_GET_LERR() errno
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_GET_LERR() (WSAGetLastError ())
 #endif
 
 /**
  * Set last socket error
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  define mhd_SCKT_SET_LERR(err) do { errno = (err); } while (0)
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_SET_LERR(err) WSASetLastError ((err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  if defined(EAGAIN) && defined(EWOULDBLOCK) && \
   ((EWOULDBLOCK + 0) != (EAGAIN + 0))
 #    define mhd_SCKT_ERR_IS_EAGAIN(err) \
@@ -118,121 +118,121 @@
 #  else
 #    define mhd_SCKT_ERR_IS_EAGAIN(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_EAGAIN(err) (WSAEWOULDBLOCK == (err))
 #endif
 
 #define mhd_SCKT_LERR_IS_EAGAIN() mhd_SCKT_ERR_IS_EAGAIN (mhd_SCKT_GET_LERR ())
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EAFNOSUPPORT
 #    define mhd_SCKT_ERR_IS_AF(err) (EAFNOSUPPORT == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_AF(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_AF(err) (WSAEAFNOSUPPORT == (err))
 #endif
 
 #define mhd_SCKT_LERR_IS_AF() mhd_SCKT_ERR_IS_AF (mhd_SCKT_GET_LERR ())
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EINVAL
 #    define mhd_SCKT_ERR_IS_EINVAL(err) (EINVAL == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_EINVAL(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_EINVAL(err) (WSAEINVAL == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EINTR
 #    define mhd_SCKT_ERR_IS_EINTR(err) (EINTR == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_EINTR(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_EINTR(err) (WSAEINTR == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef ECONNRESET
 #    define mhd_SCKT_ERR_IS_CONNRESET(err) (ECONNRESET == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_CONNRESET(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_CONNRESET(err) (WSAECONNRESET == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef ENOTCONN
 #    define mhd_SCKT_ERR_IS_NOTCONN(err) (ENOTCONN == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_NOTCONNT(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_NOTCONN(err) (WSAENOTCONN == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EOPNOTSUPP
 #    define mhd_SCKT_ERR_IS_OPNOTSUPP(err) (EOPNOTSUPP == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_OPNOTSUPP(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_OPNOTSUPP(err) (WSAEOPNOTSUPP == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef ENOPROTOOPT
 #    define mhd_SCKT_ERR_IS_NOPROTOOPT(err) (ENOPROTOOPT == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_NOPROTOOPT(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_NOPROTOOPT(err) (WSAENOPROTOOPT == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EBADF
 #    define mhd_SCKT_ERR_IS_BADF(err) (EBADF == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_BADF(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_BADF(err) ((void) (err), ! ! 0)
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef ENOTSOCK
 #    define mhd_SCKT_ERR_IS_NOTSOCK(err) (ENOTSOCK == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_NOTSOCK(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_NOTSOCK(err) (WSAENOTSOCK == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EPIPE
 #    define mhd_SCKT_ERR_IS_PIPE(err) (EPIPE == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_PIPE(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_PIPE(err) (WSAESHUTDOWN == (err))
 #endif
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef EINPROGRESS
 #    define mhd_SCKT_ERR_IS_INPROGRESS(err) (EINPROGRESS == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_INPROGRESS(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_INPROGRESS(err) (WSAEINPROGRESS == (err))
 #endif
 
@@ -242,13 +242,13 @@
  * @return boolean true is @a err match described socket error code,
  *         boolean false otherwise.
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef ECONNABORTED
 #    define mhd_SCKT_ERR_IS_DISCNN_BEFORE_ACCEPT(err) (ECONNABORTED == (err))
 #  else
 #    define mhd_SCKT_ERR_IS_DISCNN_BEFORE_ACCEPT(err) ((void) (err), ! ! 0)
 #  endif
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_DISCNN_BEFORE_ACCEPT(err) (WSAECONNRESET == (err))
 #endif
 
@@ -258,7 +258,7 @@
  * It can be keep-alive ping failure or timeout to get ACK for the
  * transmitted data.
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 /* + EHOSTUNREACH: probably reported by intermediate
    + ETIMEDOUT: probably keep-alive ping failure
    + ENETUNREACH: probably cable physically disconnected or similar */
@@ -267,7 +267,7 @@
          ((mhd_EHOSTUNREACH_OR_ZERO == (err)) || \
           (mhd_ETIMEDOUT_OR_ZERO == (err)) || \
           (mhd_ENETUNREACH_OR_ZERO == (err))))
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_CONN_BROKEN(err) \
         ( (WSAENETRESET == (err)) || (WSAECONNABORTED == (err)) || \
           (WSAETIMEDOUT == (err)) )
@@ -278,12 +278,12 @@
  * @return boolean true if @a err is any kind of "low resource" error,
  *         boolean false otherwise.
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #    define mhd_SCKT_ERR_IS_LOW_RESOURCES(err) \
         ((0 != (err)) && \
          ((mhd_EMFILE_OR_ZERO == (err)) || (mhd_ENFILE_OR_ZERO == (err)) || \
           (mhd_ENOMEM_OR_ZERO == (err)) || (mhd_ENOBUFS_OR_ZERO == (err))))
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_LOW_RESOURCES(err) \
         ( (WSAEMFILE == (err)) || (WSAENOBUFS == (err)) )
 #endif
@@ -294,16 +294,16 @@
  * @return boolean true if @a err is any kind of "low memory" error,
  *         boolean false otherwise.
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #    define mhd_SCKT_ERR_IS_LOW_MEM(err) \
         ((0 != (err)) && \
          ((mhd_ENOMEM_OR_ZERO == (err)) || (mhd_ENOBUFS_OR_ZERO == (err))))
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_ERR_IS_LOW_MEM(err) (WSAENOBUFS == (err))
 #endif
 
 
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  ifdef HAVE_SOCKETPAIR
 #    ifdef MHD_AF_UNIX
 #      define mhd_socket_pair(fdarr_ptr) \

src/mhd2/response_from.c

@@ -228,9 +228,9 @@ MHD_response_from_iovec (
     if ((total_size < iov[i].iov_len) || (0 > (ssize_t) total_size)
         || (((size_t) total_size) != total_size))
       return NULL; /* Larger than send function may report as success */
-#if defined(MHD_POSIX_SOCKETS) || ! defined(_WIN64)
+#if defined(MHD_SOCKETS_KIND_POSIX) || ! defined(_WIN64)
     i_cp++;
-#else  /* ! MHD_POSIX_SOCKETS && _WIN64 */
+#else  /* ! MHD_SOCKETS_KIND_POSIX && _WIN64 */
     if (1)
     {
       size_t i_add;
@@ -242,7 +242,7 @@ MHD_response_from_iovec (
       if (i_cp < i_add)
         return NULL; /* Counter overflow */
     }
-#endif /* ! MHD_POSIX_SOCKETS && _WIN64 */
+#endif /* ! MHD_SOCKETS_KIND_POSIX && _WIN64 */
   }
   if (0 == total_size)
   {
@@ -278,7 +278,7 @@ MHD_response_from_iovec (
 
       if (0 == element_size)
         continue;         /* skip zero-sized elements */
-#if defined(MHD_WINSOCK_SOCKETS) && defined(_WIN64)
+#if defined(MHD_SOCKETS_KIND_WINSOCK) && defined(_WIN64)
       while (mhd_IOV_ELMN_MAX_SIZE < element_size)
       {
         iov_copy[i_cp].iov_base = (char *) mhd_DROP_CONST (buf);
@@ -287,7 +287,7 @@ MHD_response_from_iovec (
         element_size -= mhd_IOV_ELMN_MAX_SIZE;
         i_cp++;
       }
-#endif /* MHD_WINSOCK_SOCKETS && _WIN64 */
+#endif /* MHD_SOCKETS_KIND_WINSOCK && _WIN64 */
       iov_copy[i_cp].iov_base = mhd_DROP_CONST (buf);
       iov_copy[i_cp].iov_len = (mhd_iov_elmn_size) element_size;
       i_cp++;

src/mhd2/sys_ip_headers.h

@@ -32,7 +32,7 @@
 #include "mhd_socket_type.h"
 #include "sys_sockets_headers.h"
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  ifdef HAVE_INETLIB_H
 #    include <inetLib.h>
 #  endif /* HAVE_INETLIB_H */

src/mhd2/sys_poll.h

@@ -34,10 +34,10 @@
 
 #ifdef MHD_USE_POLL
 #  include "mhd_socket_type.h"
-#  if defined(MHD_POSIX_SOCKETS)
+#  if defined(MHD_SOCKETS_KIND_POSIX)
 #    include <poll.h>
 #    define mhd_poll poll
-#  elif defined(MHD_WINSOCK_SOCKETS)
+#  elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #    include <winsock2.h>
 #    define mhd_poll WSAPoll
 #  else

src/mhd2/sys_select.h

@@ -31,7 +31,7 @@
 
 #ifdef MHD_USE_SELECT
 #  include "mhd_socket_type.h"
-#  if defined(MHD_POSIX_SOCKETS)
+#  if defined(MHD_SOCKETS_KIND_POSIX)
 #    ifdef HAVE_SYS_SELECT_H
 #      include <sys/select.h>
 #    else
@@ -50,7 +50,7 @@
 #        include  <selectLib.h>
 #      endif
 #    endif
-#  elif defined(MHD_WINSOCK_SOCKETS)
+#  elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #    include <winsock2.h>
 #  else
 #error Uknown sockets type

src/mhd2/sys_sockets_headers.h

@@ -33,7 +33,7 @@
 
 #include "mhd_socket_type.h"
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  include "sys_base_types.h" /* required on old platforms */
 #  ifdef HAVE_SYS_SOCKET_H
 #    include <sys/socket.h>
@@ -41,32 +41,32 @@
 #  ifdef HAVE_SOCKLIB_H
 #    include <sockLib.h>
 #  endif /* HAVE_SOCKLIB_H */
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  include <winsock2.h>
 #endif
 #ifdef HAVE_SYS_UN_H
 #  include <sys/un.h>
 #endif
 
-#if defined(HAVE_SOCK_NONBLOCK) && ! defined(MHD_WINSOCK_SOCKETS)
+#if defined(HAVE_SOCK_NONBLOCK) && ! defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SOCK_NONBLOCK SOCK_NONBLOCK
 #else
 #  define mhd_SOCK_NONBLOCK (0)
 #endif
 
-#if defined(SOCK_CLOEXEC) && ! defined(MHD_WINSOCK_SOCKETS)
+#if defined(SOCK_CLOEXEC) && ! defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SOCK_CLOEXEC SOCK_CLOEXEC
 #else
 #  define mhd_SOCK_CLOEXEC (0)
 #endif
 
-#if defined(SOCK_NOSIGPIPE) && ! defined(MHD_WINSOCK_SOCKETS)
+#if defined(SOCK_NOSIGPIPE) && ! defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SOCK_NOSIGPIPE SOCK_NOSIGPIPE
 #else
 #  define mhd_SOCK_NOSIGPIPE (0)
 #endif
 
-#if defined(MSG_NOSIGNAL) && ! defined(MHD_WINSOCK_SOCKETS)
+#if defined(MSG_NOSIGNAL) && ! defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_MSG_NOSIGNAL MSG_NOSIGNAL
 #else
 #  define mhd_MSG_NOSIGNAL (0)
@@ -95,28 +95,28 @@
  * mhd_SCKT_OPT_BOOL is the type for bool parameters
  * for setsockopt()/getsockopt() functions
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  define mhd_SCKT_OPT_BOOL int
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define mhd_SCKT_OPT_BOOL BOOL
-#endif /* MHD_WINSOCK_SOCKETS */
+#endif /* MHD_SOCKETS_KIND_WINSOCK */
 
 /**
  * mhd_SCKT_SEND_SIZE is type used to specify size for send() and recv()
  * functions
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 typedef size_t mhd_SCKT_SEND_SIZE;
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 typedef int mhd_SCKT_SEND_SIZE;
 #endif
 
 /**
  * MHD_SCKT_SEND_MAX_SIZE_ is maximum send()/recv() size value.
  */
-#if defined(MHD_POSIX_SOCKETS)
+#if defined(MHD_SOCKETS_KIND_POSIX)
 #  define MHD_SCKT_SEND_MAX_SIZE_ SSIZE_MAX
-#elif defined(MHD_WINSOCK_SOCKETS)
+#elif defined(MHD_SOCKETS_KIND_WINSOCK)
 #  define MHD_SCKT_SEND_MAX_SIZE_ (0x7FFFFFFF) /* INT_MAX */
 #endif
 
@@ -132,7 +132,7 @@ typedef int mhd_SCKT_SEND_SIZE;
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
   defined(__OpenBSD__) || defined(__NetBSD__) || \
-  defined(MHD_WINSOCK_SOCKETS) || defined(__MACH__) || defined(__sun) || \
+  defined(MHD_SOCKETS_KIND_WINSOCK) || defined(__MACH__) || defined(__sun) || \
   defined(SOMEBSD)
 /* Most of the OSes inherit nonblocking setting from the listen socket */
 #  define MHD_ACCEPTED_INHERITS_NONBLOCK 1
@@ -150,10 +150,10 @@ typedef int mhd_SCKT_SEND_SIZE;
  * so sendfile() or writev() calls are avoided in application threads.
  */
 #  define mhd_SEND_SPIPE_SUPPRESS_POSSIBLE   1
-#endif /* MHD_WINSOCK_SOCKETS || MHD_socket_nosignal_ || MSG_NOSIGNAL */
+#endif /* MHD_SOCKETS_KIND_WINSOCK || MHD_socket_nosignal_ || MSG_NOSIGNAL */
 
 
-#if ! defined(MHD_WINSOCK_SOCKETS)
+#if ! defined(MHD_SOCKETS_KIND_WINSOCK)
 /**
  * Indicate that suppression of SIGPIPE is required for some network
  * system calls.

src/mhd2/sys_sockets_types.h

@@ -34,7 +34,7 @@
 
 #include "mhd_socket_type.h"
 
-#ifdef MHD_POSIX_SOCKETS
+#ifdef MHD_SOCKETS_KIND_POSIX
 #  ifdef HAVE_SYS_SOCKET_H
 #    include <sys/socket.h>
 #  else

src/mhd2/upgraded_net.c

@@ -51,7 +51,7 @@
 
 
 #if ! defined (MHD_USE_POLL) && \
-  (defined(MHD_POSIX_SOCKETS) || ! defined(MHD_USE_SELECT))
+  (defined(MHD_SOCKETS_KIND_POSIX) || ! defined(MHD_USE_SELECT))
 #  if defined(_WIN32) || defined(HAVE_NANOSLEEP) || defined(HAVE_USLEEP)
 #    define mhd_HAVE_MHD_SLEEP 1
 
@@ -95,7 +95,7 @@ mhd_sleep (uint_fast32_t millisec)
 
 
 #endif /* _WIN32 || HAVE_NANOSLEEP || HAVE_USLEEP */
-#endif /* ! MHD_USE_POLL) && (MHD_POSIX_SOCKETS || ! MHD_USE_SELECT) */
+#endif /* ! MHD_USE_POLL) && (MHD_SOCKETS_KIND_POSIX || ! MHD_USE_SELECT) */
 
 
 MHD_EXTERN_
@@ -219,11 +219,11 @@ MHD_upgraded_recv (struct MHD_UpgradedHandle *MHD_RESTRICT urh,
 #else /* ! MHD_USE_POLL */
 #  if defined(MHD_USE_SELECT)
       bool use_select;
-#    ifdef MHD_POSIX_SOCKETS
+#    ifdef MHD_SOCKETS_KIND_POSIX
       use_select = (socket_fd < FD_SETSIZE);
-#    else  /* MHD_WINSOCK_SOCKETS */
+#    else  /* MHD_SOCKETS_KIND_WINSOCK */
       use_select = true;
-#    endif /* MHD_WINSOCK_SOCKETS */
+#    endif /* MHD_SOCKETS_KIND_WINSOCK */
       if (use_select)
       {
         fd_set rfds;
@@ -231,11 +231,11 @@ MHD_upgraded_recv (struct MHD_UpgradedHandle *MHD_RESTRICT urh,
         int wait_err;
         struct timeval tmvl;
 
-#    ifdef MHD_POSIX_SOCKETS
+#    ifdef MHD_SOCKETS_KIND_POSIX
         tmvl.tv_sec = (time_t) (max_wait_millisec / 1000);
-#    else  /* MHD_WINSOCK_SOCKETS */
+#    else  /* MHD_SOCKETS_KIND_WINSOCK */
         tmvl.tv_sec = (long) (max_wait_millisec / 1000);
-#    endif /* MHD_WINSOCK_SOCKETS */
+#    endif /* MHD_SOCKETS_KIND_WINSOCK */
         if ((max_wait_millisec / 1000 != (uint_fast64_t) tmvl.tv_sec) ||
             (0 > tmvl.tv_sec))
         {
@@ -451,11 +451,11 @@ MHD_upgraded_send (struct MHD_UpgradedHandle *MHD_RESTRICT urh,
     }
 #else /* ! MHD_USE_POLL */
 #  if defined(MHD_USE_SELECT)
-#    ifdef MHD_POSIX_SOCKETS
+#    ifdef MHD_SOCKETS_KIND_POSIX
     use_select = (socket_fd < FD_SETSIZE);
-#    else  /* MHD_WINSOCK_SOCKETS */
+#    else  /* MHD_SOCKETS_KIND_WINSOCK */
     use_select = true;
-#    endif /* MHD_WINSOCK_SOCKETS */
+#    endif /* MHD_SOCKETS_KIND_WINSOCK */
     if (use_select)
     {
       fd_set wfds;
@@ -472,11 +472,11 @@ MHD_upgraded_send (struct MHD_UpgradedHandle *MHD_RESTRICT urh,
       }
       else
       {
-#    ifdef MHD_POSIX_SOCKETS
+#    ifdef MHD_SOCKETS_KIND_POSIX
         tmvl.tv_sec = (time_t) (wait_left / 1000);
-#    else  /* MHD_WINSOCK_SOCKETS */
+#    else  /* MHD_SOCKETS_KIND_WINSOCK */
         tmvl.tv_sec = (long) (wait_left / 1000);
-#    endif /* MHD_WINSOCK_SOCKETS */
+#    endif /* MHD_SOCKETS_KIND_WINSOCK */
         if ((max_wait_millisec / 1000 != (uint_fast64_t) tmvl.tv_sec) ||
             (0 > tmvl.tv_sec))
         {