From ab5ea93398f72151d8df79576d48360a420329c7 Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Sun, 6 Oct 2024 22:01:15 +0200 Subject: [PATCH] Renamed threads kind macros --- configure.ac | 8 ++--- src/incl_priv/mhd_sys_options.h | 4 +-- src/mhd2/mhd_locks.h | 4 +-- src/mhd2/mhd_threads.c | 14 ++++---- src/mhd2/mhd_threads.h | 52 ++++++++++++++-------------- src/mhd2/sys_thread_entry_type.h | 4 +-- src/tests/upgrade/test_upgrade.c | 58 ++++++++++++++++---------------- 7 files changed, 72 insertions(+), 72 deletions(-) diff --git a/configure.ac b/configure.ac index 8b26117c..3d90acc2 100644 --- a/configure.ac +++ b/configure.ac @@ -1721,12 +1721,12 @@ AS_IF([test "x$with_threads" = "xnone"], AS_IF([test "x$USE_THREADS" = "xposix"], [CC="$PTHREAD_CC" - AC_DEFINE([MHD_USE_POSIX_THREADS],[1],[define to use pthreads]) + AC_DEFINE([mhd_THREADS_KIND_POSIX],[1],[define to use pthreads]) MHD_LIB_CFLAGS="$MHD_LIB_CFLAGS $PTHREAD_CFLAGS" MHD_LIBDEPS="$PTHREAD_LIBS $MHD_LIBDEPS" MHD_LIBDEPS_PKGCFG="$PTHREAD_LIBS $MHD_LIBDEPS_PKGCFG"], [AS_IF([test "x$USE_THREADS" = "xw32"], - [AC_DEFINE([MHD_USE_W32_THREADS],[1],[define to use W32 threads])])]) + [AC_DEFINE([mhd_THREADS_KIND_W32],[1],[define to use W32 threads])])]) AM_CONDITIONAL([USE_POSIX_THREADS], [test "x$USE_THREADS" = "xposix"]) AM_CONDITIONAL([USE_W32_THREADS], [test "x$USE_THREADS" = "xw32"]) AM_CONDITIONAL([MHD_USE_THREADS], [test "x$USE_THREADS" != "xnone"]) @@ -1905,11 +1905,11 @@ choke me #endif /* Keep in sync with mhd_threads.h */ -#if defined(MHD_USE_POSIX_THREADS) && (defined(HAVE_PTHREAD_ATTR_SETNAME_NP_NETBSD) || defined(HAVE_PTHREAD_ATTR_SETNAME_NP_IBMI) || \ +#if defined(mhd_THREADS_KIND_POSIX) && (defined(HAVE_PTHREAD_ATTR_SETNAME_NP_NETBSD) || defined(HAVE_PTHREAD_ATTR_SETNAME_NP_IBMI) || \ defined(HAVE_PTHREAD_SETNAME_NP_GNU) || defined(HAVE_PTHREAD_SET_NAME_NP_FREEBSD) || defined(HAVE_PTHREAD_SETNAME_NP_DARWIN) || \ defined(HAVE_PTHREAD_SETNAME_NP_NETBSD) ) (void) 0; /* no-op */ -#elif defined(MHD_USE_W32_THREADS) && defined(_MSC_FULL_VER) +#elif defined(mhd_THREADS_KIND_W32) && defined(_MSC_FULL_VER) (void) 0; /* no-op */ #else #error No thread name function is available. diff --git a/src/incl_priv/mhd_sys_options.h b/src/incl_priv/mhd_sys_options.h index 7a4901be..f6ded1b4 100644 --- a/src/incl_priv/mhd_sys_options.h +++ b/src/incl_priv/mhd_sys_options.h @@ -326,11 +326,11 @@ #endif /* HAVE_LINUX_SENDFILE || HAVE_FREEBSD_SENDFILE || HAVE_DARWIN_SENDFILE */ -#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) || defined(mhd_THREADS_KIND_W32) # ifndef MHD_USE_THREADS # define MHD_USE_THREADS 1 # endif -#endif /* MHD_USE_POSIX_THREADS || MHD_USE_W32_THREADS */ +#endif /* mhd_THREADS_KIND_POSIX || mhd_THREADS_KIND_W32 */ /** * Macro to drop 'const' qualifier from pointer. diff --git a/src/mhd2/mhd_locks.h b/src/mhd2/mhd_locks.h index f132a18e..734bcd56 100644 --- a/src/mhd2/mhd_locks.h +++ b/src/mhd2/mhd_locks.h @@ -41,14 +41,14 @@ #ifdef MHD_USE_THREADS -#if defined(MHD_USE_W32_THREADS) +#if defined(mhd_THREADS_KIND_W32) # define mhd_MUTEX_KIND_W32_CS 1 # if _WIN32_WINNT >= 0x0602 /* Win8 or later */ # include # else # include # endif -#elif defined(HAVE_PTHREAD_H) && defined(MHD_USE_POSIX_THREADS) +#elif defined(HAVE_PTHREAD_H) && defined(mhd_THREADS_KIND_POSIX) # define mhd_MUTEX_KIND_PTHREAD 1 # include # ifdef HAVE_STDDEF_H diff --git a/src/mhd2/mhd_threads.c b/src/mhd2/mhd_threads.c index 239eff2a..1e7941f7 100644 --- a/src/mhd2/mhd_threads.c +++ b/src/mhd2/mhd_threads.c @@ -26,7 +26,7 @@ #include "mhd_threads.h" #include "sys_null_macro.h" -#ifdef MHD_USE_W32_THREADS +#ifdef mhd_THREADS_KIND_W32 # include #endif #if defined(MHD_USE_THREAD_NAME_) @@ -47,7 +47,7 @@ #else /* MHD_USE_THREAD_NAME_ */ -# if defined(MHD_USE_POSIX_THREADS) +# if defined(mhd_THREADS_KIND_POSIX) # if defined(HAVE_PTHREAD_ATTR_SETNAME_NP_NETBSD) || \ defined(HAVE_PTHREAD_ATTR_SETNAME_NP_IBMI) # define MHD_USE_THREAD_ATTR_SETNAME 1 @@ -111,7 +111,7 @@ mhd_set_thread_name (const mhd_thread_ID_native thread_id, # define mhd_set_cur_thread_name(n) (! (pthread_setname_np ((n)))) # endif /* HAVE_PTHREAD_SETNAME_NP_DARWIN */ -# elif defined(MHD_USE_W32_THREADS) +# elif defined(mhd_THREADS_KIND_W32) # ifndef _MSC_FULL_VER #error Thread name available only for VC-compiler # else /* _MSC_FULL_VER */ @@ -167,7 +167,7 @@ mhd_set_thread_name (const mhd_thread_ID_native thread_id, # define mhd_set_cur_thread_name(n) \ mhd_set_thread_name ((mhd_thread_ID_native) (-1),(n)) # endif /* _MSC_FULL_VER */ -# endif /* MHD_USE_W32_THREADS */ +# endif /* mhd_THREADS_KIND_W32 */ #endif /* MHD_USE_THREAD_NAME_ */ @@ -189,7 +189,7 @@ mhd_create_thread (mhd_thread_handle_ID *handle_id, mhd_THREAD_START_ROUTINE start_routine, void *arg) { -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) int res; # if defined(mhd_thread_handle_ID_get_native_handle_ptr) pthread_t *const new_tid_ptr = @@ -234,7 +234,7 @@ mhd_create_thread (mhd_thread_handle_ID *handle_id, # endif /* ! mhd_thread_handle_ID_set_current_thread_ID */ return 0 == res; -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) uintptr_t thr_handle; unsigned int stack_size_w32; # if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT @@ -262,7 +262,7 @@ mhd_create_thread (mhd_thread_handle_ID *handle_id, thr_handle); return true; -#endif /* MHD_USE_W32_THREADS */ +#endif /* mhd_THREADS_KIND_W32 */ } diff --git a/src/mhd2/mhd_threads.h b/src/mhd2/mhd_threads.h index 2cae2a4b..cf4a0094 100644 --- a/src/mhd2/mhd_threads.h +++ b/src/mhd2/mhd_threads.h @@ -38,12 +38,12 @@ #include "mhd_sys_options.h" -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) # include # ifndef MHD_USE_THREADS # define MHD_USE_THREADS 1 # endif -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) # include # ifndef MHD_USE_THREADS # define MHD_USE_THREADS 1 @@ -56,12 +56,12 @@ #include "sys_base_types.h" #include "sys_thread_entry_type.h" -#if defined(MHD_USE_POSIX_THREADS) && defined(MHD_USE_W32_THREADS) -# error Both MHD_USE_POSIX_THREADS and MHD_USE_W32_THREADS are defined -#endif /* MHD_USE_POSIX_THREADS && MHD_USE_W32_THREADS */ +#if defined(mhd_THREADS_KIND_POSIX) && defined(mhd_THREADS_KIND_W32) +# error Both mhd_THREADS_KIND_POSIX and mhd_THREADS_KIND_W32 are defined +#endif /* mhd_THREADS_KIND_POSIX && mhd_THREADS_KIND_W32 */ #ifndef MHD_NO_THREAD_NAMES -# if defined(MHD_USE_POSIX_THREADS) +# if defined(mhd_THREADS_KIND_POSIX) # if defined(HAVE_PTHREAD_SETNAME_NP_GNU) || \ defined(HAVE_PTHREAD_SET_NAME_NP_FREEBSD) || \ defined(HAVE_PTHREAD_SETNAME_NP_DARWIN) || \ @@ -70,7 +70,7 @@ defined(HAVE_PTHREAD_ATTR_SETNAME_NP_IBMI) # define MHD_USE_THREAD_NAME_ # endif /* HAVE_PTHREAD_SETNAME_NP */ -# elif defined(MHD_USE_W32_THREADS) +# elif defined(mhd_THREADS_KIND_W32) # ifdef _MSC_FULL_VER /* Thread names only available with VC compiler */ # define MHD_USE_THREAD_NAME_ @@ -80,19 +80,19 @@ /* ** Thread handle - used to control the thread ** */ -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) /** * The native type to control the thread from other threads */ typedef pthread_t mhd_thread_handle_native; -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) /** * The native type to control the thread from other threads */ typedef HANDLE mhd_thread_handle_native; #endif -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) # if defined(__gnu_linux__) || \ (defined(__linux__) && defined(__GLIBC__)) /* The next part of code is disabled because it relies on undocumented @@ -107,7 +107,7 @@ typedef HANDLE mhd_thread_handle_native; ((mhd_thread_handle_native) 0) # endif /* Disabled code */ # endif /* __gnu_linux__ || (__linux__ && __GLIBC__) */ -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) /* On W32 the invalid value for thread handle is described directly in the official documentation. */ /** @@ -115,9 +115,9 @@ typedef HANDLE mhd_thread_handle_native; */ # define mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID \ ((mhd_thread_handle_native) NULL) -#endif /* MHD_USE_W32_THREADS */ +#endif /* mhd_THREADS_KIND_W32 */ -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) /** * Wait until specified thread is ended and free the thread handle on success. * @param native_handle the handle to watch @@ -125,7 +125,7 @@ typedef HANDLE mhd_thread_handle_native; */ # define mhd_join_thread(native_handle) \ (! pthread_join ((native_handle), NULL)) -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) /** * Wait until specified thread is ended and the free thread handle on success. * @param native_handle the handle to watch @@ -211,7 +211,7 @@ typedef mhd_thread_handle_native mhd_thread_handle; /* ** Thread ID - used to check threads match ** */ -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) /** * The native type used to check whether the current thread matches * the expected thread @@ -229,7 +229,7 @@ typedef pthread_t mhd_thread_ID_native; */ # define mhd_thread_ID_native_equal(id1,id2) \ (pthread_equal ((id1),(id2))) -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) /** * The native type used to check whether the current thread matches * the expected thread @@ -258,7 +258,7 @@ typedef DWORD mhd_thread_ID_native; mhd_thread_ID_native_equal ((id), mhd_thread_ID_native_current ()) -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) # if defined(mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID) /** * The native invalid value for native thread ID @@ -266,13 +266,13 @@ typedef DWORD mhd_thread_ID_native; # define MHD_THREAD_ID_NATIVE_VALUE_INVALID_ \ mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID # endif /* mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID */ -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) /** * The native invalid value for native thread ID */ # define MHD_THREAD_ID_NATIVE_VALUE_INVALID_ \ ((mhd_thread_ID_native) 0) -#endif /* MHD_USE_W32_THREADS */ +#endif /* mhd_THREADS_KIND_W32 */ #if ! defined(MHD_THREAD_ID_NATIVE_VALUE_INVALID_) /** @@ -356,7 +356,7 @@ typedef mhd_thread_ID_native mhd_thread_ID; mhd_thread_ID_set_native ((ID_ptr),mhd_thread_ID_native_current ()) -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) # if defined(mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID) && \ ! defined(MHD_THREAD_ID_NATIVE_VALUE_INVALID_) # error \ @@ -366,7 +366,7 @@ typedef mhd_thread_ID_native mhd_thread_ID; # error \ MHD_THREAD_ID_NATIVE_VALUE_INVALID_ is not defined, but MHD_THREAD_ID_NATIVE_VALUE_INVALID_ is defined # endif -#endif /* MHD_USE_POSIX_THREADS */ +#endif /* mhd_THREADS_KIND_POSIX */ /* When staring a new thread, the kernel (and thread implementation) may * pause the calling (initial) thread and start the new thread. @@ -396,7 +396,7 @@ typedef mhd_thread_ID_native mhd_thread_ID; /* * handle - must be valid when other thread knows that particular thread is started. * ID - must be valid when code is executed inside thread */ -#if defined(MHD_USE_POSIX_THREADS) && \ +#if defined(mhd_THREADS_KIND_POSIX) && \ defined(MHD_PTHREAD_CREATE__SET_ID_BEFORE_START_THREAD) && \ defined(mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID) && \ defined(MHD_THREAD_ID_NATIVE_VALUE_INVALID_) && \ @@ -408,7 +408,7 @@ union mhd_thread_handle_ID_ }; typedef union mhd_thread_handle_ID_ mhd_thread_handle_ID; # define MHD_THREAD_HANDLE_ID_IS_UNION 1 -#else /* !MHD_USE_POSIX_THREADS +#else /* !mhd_THREADS_KIND_POSIX || !MHD_PTHREAD_CREATE__SET_ID_BEFORE_START_THREAD || !mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID || !MHD_THREAD_ID_NATIVE_VALUE_INVALID_ @@ -419,7 +419,7 @@ struct mhd_thread_handle_ID_ mhd_thread_ID ID; /**< To be used in the thread itself */ }; typedef struct mhd_thread_handle_ID_ mhd_thread_handle_ID; -#endif /* !MHD_USE_POSIX_THREADS +#endif /* !mhd_THREADS_KIND_POSIX || !MHD_PTHREAD_CREATE__SET_ID_BEFORE_START_THREAD || !mhd_THREAD_HANDLE_NATIVE_VALUE_INVALID || !MHD_THREAD_ID_NATIVE_VALUE_INVALID_ @@ -471,9 +471,9 @@ typedef struct mhd_thread_handle_ID_ mhd_thread_handle_ID; mhd_thread_ID_is_valid ((hndl_id).ID) #if defined(MHD_THREAD_HANDLE_ID_IS_UNION) -# if defined(MHD_USE_W32_THREADS) +# if defined(mhd_THREADS_KIND_W32) # error mhd_thread_handle_ID cannot be a union with W32 threads -# endif /* MHD_USE_W32_THREADS */ +# endif /* mhd_THREADS_KIND_W32 */ /** * Set current thread ID in the variable pointed by the @a hndl_id_ptr */ diff --git a/src/mhd2/sys_thread_entry_type.h b/src/mhd2/sys_thread_entry_type.h index f0c2cbc5..617ca878 100644 --- a/src/mhd2/sys_thread_entry_type.h +++ b/src/mhd2/sys_thread_entry_type.h @@ -29,10 +29,10 @@ #include "mhd_sys_options.h" -#if defined(MHD_USE_POSIX_THREADS) +#if defined(mhd_THREADS_KIND_POSIX) # define mhd_THRD_RTRN_TYPE void* # define mhd_THRD_CALL_SPEC -#elif defined(MHD_USE_W32_THREADS) +#elif defined(mhd_THREADS_KIND_W32) # define mhd_THRD_RTRN_TYPE unsigned # define mhd_THRD_CALL_SPEC __stdcall #endif diff --git a/src/tests/upgrade/test_upgrade.c b/src/tests/upgrade/test_upgrade.c index 925d1be4..b546aa21 100644 --- a/src/tests/upgrade/test_upgrade.c +++ b/src/tests/upgrade/test_upgrade.c @@ -61,13 +61,13 @@ # endif /* HAVE_FORK && HAVE_WAITPID */ #endif /* HTTPS_SUPPORT */ -#if defined(MHD_POSIX_SOCKETS) -# ifdef MHD_WINSOCK_SOCKETS -# error Both MHD_POSIX_SOCKETS and MHD_WINSOCK_SOCKETS are defined -# endif /* MHD_WINSOCK_SOCKETS */ -#elif ! defined(MHD_WINSOCK_SOCKETS) -# error Neither MHD_POSIX_SOCKETS nor MHD_WINSOCK_SOCKETS are defined -#endif /* MHD_WINSOCK_SOCKETS */ +#if defined(MHD_SOCKETS_KIND_POSIX) +# ifdef MHD_SOCKETS_KIND_WINSOCK +# error Both MHD_SOCKETS_KIND_POSIX and MHD_SOCKETS_KIND_WINSOCK are defined +# endif /* MHD_SOCKETS_KIND_WINSOCK */ +#elif ! defined(MHD_SOCKETS_KIND_WINSOCK) +# error Neither MHD_SOCKETS_KIND_POSIX nor MHD_SOCKETS_KIND_WINSOCK are defined +#endif /* MHD_SOCKETS_KIND_WINSOCK */ #ifndef mhd_SSTR_LEN @@ -89,7 +89,7 @@ # define SHUT_RDWR SD_BOTH #endif -#if defined(MHD_POSIX_SOCKETS) +#if defined(MHD_SOCKETS_KIND_POSIX) # if defined(ENETUNREACH) # define mhdt_SCKT_HARD_ERR ENETUNREACH # elif defined(ENOTCONN) @@ -103,7 +103,7 @@ # else # define mhdt_SCKT_HARD_ERR 99 /* Fallback, never used in practice */ # endif -#else /* MHD_WINSOCK_SOCKETS */ +#else /* MHD_SOCKETS_KIND_WINSOCK */ # define mhdt_SCKT_HARD_ERR WSAENETRESET #endif @@ -123,9 +123,9 @@ _externalErrorExit_func (const char *errDesc, const char *funcName, int lineNum) fprintf (stderr, ".\nLast errno value: %d (%s)\n", (int) errno, strerror (errno)); -#ifdef MHD_WINSOCK_SOCKETS +#ifdef MHD_SOCKETS_KIND_WINSOCK fprintf (stderr, "WSAGetLastError() value: %d\n", (int) WSAGetLastError ()); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ fflush (stderr); exit (99); } @@ -167,9 +167,9 @@ _testErrorLog_func (const char *errDesc, const char *funcName, int lineNum) fprintf (stderr, ".\nLast errno value: %d (%s)\n", (int) errno, strerror (errno)); -#ifdef MHD_WINSOCK_SOCKETS +#ifdef MHD_SOCKETS_KIND_WINSOCK fprintf (stderr, "WSAGetLastError() value: %d\n", (int) WSAGetLastError ()); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ fflush (stderr); } @@ -328,7 +328,7 @@ gnutlscli_connect (int *sock, static void make_blocking (MHD_Socket fd) { -#if defined(MHD_POSIX_SOCKETS) +#if defined(MHD_SOCKETS_KIND_POSIX) int flags; flags = fcntl (fd, F_GETFL); @@ -337,12 +337,12 @@ make_blocking (MHD_Socket fd) if ((flags & ~O_NONBLOCK) != flags) if (-1 == fcntl (fd, F_SETFL, flags & ~O_NONBLOCK)) externalErrorExitDesc ("fcntl() failed"); -#elif defined(MHD_WINSOCK_SOCKETS) +#elif defined(MHD_SOCKETS_KIND_WINSOCK) unsigned long flags = 0; if (0 != ioctlsocket (fd, (int) FIONBIO, &flags)) externalErrorExitDesc ("ioctlsocket() failed"); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ } @@ -357,7 +357,7 @@ make_blocking (MHD_Socket fd) static void make_nonblocking (MHD_Socket fd) { -#if defined(MHD_POSIX_SOCKETS) +#if defined(MHD_SOCKETS_KIND_POSIX) int flags; flags = fcntl (fd, F_GETFL); @@ -366,12 +366,12 @@ make_nonblocking (MHD_Socket fd) if (O_NONBLOCK != (flags & O_NONBLOCK)) if (-1 == fcntl (fd, F_SETFL, flags | O_NONBLOCK)) externalErrorExitDesc ("fcntl() failed"); -#elif defined(MHD_WINSOCK_SOCKETS) +#elif defined(MHD_SOCKETS_KIND_WINSOCK) unsigned long flags = 1; if (0 != ioctlsocket (fd, (int) FIONBIO, &flags)) externalErrorExitDesc ("ioctlsocket() failed"); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ } @@ -393,13 +393,13 @@ make_nodelay (MHD_Socket fd) sizeof (on_val))) return; /* Success exit point */ -#ifndef MHD_WINSOCK_SOCKETS +#ifndef MHD_SOCKETS_KIND_WINSOCK fprintf (stderr, "Failed to enable TCP_NODELAY on socket (ignored). " "errno: %d (%s)\n", (int) errno, strerror (errno)); -#else /* MHD_WINSOCK_SOCKETS */ +#else /* MHD_SOCKETS_KIND_WINSOCK */ fprintf (stderr, "Failed to enable TCP_NODELAY on socket (ignored). " "WSAGetLastError() value: %d\n", (int) WSAGetLastError ()); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ fflush (stderr); #endif /* TCP_NODELAY */ } @@ -632,10 +632,10 @@ wr_wait_socket_ready_noabort_ (struct wr_socket *s, struct timeval tmo; struct timeval *tmo_ptr; -#ifndef MHD_WINSOCK_SOCKETS +#ifndef MHD_SOCKETS_KIND_WINSOCK if (FD_SETSIZE <= s->fd) externalErrorExitDesc ("Too large FD value"); -#endif /* ! MHD_WINSOCK_SOCKETS */ +#endif /* ! MHD_SOCKETS_KIND_WINSOCK */ FD_ZERO (&fds); FD_SET (s->fd, &fds); if (0 <= timeout_ms) @@ -666,12 +666,12 @@ wr_wait_socket_ready_noabort_ (struct wr_socket *s, fprintf (stderr, "Timeout"); else { -#ifndef MHD_WINSOCK_SOCKETS +#ifndef MHD_SOCKETS_KIND_WINSOCK fprintf (stderr, "Error %d (%s)", (int) errno, strerror (errno)); -#else /* MHD_WINSOCK_SOCKETS */ +#else /* MHD_SOCKETS_KIND_WINSOCK */ fprintf (stderr, "Error (WSAGetLastError code: %d)", (int) WSAGetLastError ()); -#endif /* MHD_WINSOCK_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_WINSOCK */ } fprintf (stderr, " waiting for socket to be available for %s.\n", (WR_WAIT_FOR_RECV == wait_for) ? "receiving" : "sending"); @@ -715,7 +715,7 @@ wr_connect_tmo (struct wr_socket *s, bool connect_completed = false; err = mhd_SCKT_GET_LERR (); -#if defined(MHD_POSIX_SOCKETS) +#if defined(MHD_SOCKETS_KIND_POSIX) while (! connect_completed && (EINTR == err)) { connect_completed = (0 == connect (s->fd, addr, (socklen_t) length)); @@ -728,7 +728,7 @@ wr_connect_tmo (struct wr_socket *s, connect_completed = true; } } -#endif /* MHD_POSIX_SOCKETS */ +#endif /* MHD_SOCKETS_KIND_POSIX */ if (! connect_completed && (mhd_SCKT_ERR_IS_INPROGRESS (err) || mhd_SCKT_ERR_IS_EAGAIN (err))) /* No modern system uses EAGAIN, except W32 */