[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: daemon.c: minor marc
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: daemon.c: minor marcos refactoring for clarity |
Date: |
Tue, 11 Jun 2019 22:24:37 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new d4935945 daemon.c: minor marcos refactoring for clarity
d4935945 is described below
commit d49359450cc6048df6fad758f2078b429dce28d8
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Tue Jun 11 11:21:24 2019 +0300
daemon.c: minor marcos refactoring for clarity
---
src/microhttpd/daemon.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 0764f286..8ec310cc 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -167,12 +167,12 @@ void
MHD_init(void);
-#if defined(_WIN32) && ! defined(__CYGWIN__)
+#if defined(MHD_WINSOCK_SOCKETS)
/**
* Track initialization of winsock
*/
static int mhd_winsock_inited_ = 0;
-#endif
+#endif /* MHD_WINSOCK_SOCKETS */
#ifdef _AUTOINIT_FUNCS_ARE_SUPPORTED
/**
@@ -7132,20 +7132,20 @@ static struct gcry_thread_cbs gcry_threads_w32 = {
void
MHD_init(void)
{
-#if defined(_WIN32) && ! defined(__CYGWIN__)
+#if defined(MHD_WINSOCK_SOCKETS)
WSADATA wsd;
-#endif /* _WIN32 && ! __CYGWIN__ */
+#endif /* MHD_WINSOCK_SOCKETS */
if (NULL == mhd_panic)
mhd_panic = &mhd_panic_std;
-#if defined(_WIN32) && ! defined(__CYGWIN__)
+#if defined(MHD_WINSOCK_SOCKETS)
if (0 != WSAStartup(MAKEWORD(2, 2), &wsd))
MHD_PANIC (_("Failed to initialize winsock\n"));
mhd_winsock_inited_ = 1;
if (2 != LOBYTE(wsd.wVersion) && 2 != HIBYTE(wsd.wVersion))
MHD_PANIC (_("Winsock version 2.2 is not available\n"));
-#endif
+#endif /* MHD_WINSOCK_SOCKETS */
#ifdef HTTPS_SUPPORT
#ifdef MHD_HTTPS_REQUIRE_GRYPT
#if GCRYPT_VERSION_NUMBER < 0x010600
@@ -7179,10 +7179,10 @@ MHD_fini(void)
#ifdef HTTPS_SUPPORT
gnutls_global_deinit ();
#endif /* HTTPS_SUPPORT */
-#if defined(_WIN32) && ! defined(__CYGWIN__)
+#if defined(MHD_WINSOCK_SOCKETS)
if (mhd_winsock_inited_)
WSACleanup();
-#endif
+#endif /* MHD_WINSOCK_SOCKETS */
MHD_monotonic_sec_counter_finish();
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: daemon.c: minor marcos refactoring for clarity,
gnunet <=