diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2019-06-11 11:21:24 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2019-06-11 23:23:30 +0300 |
commit | d49359450cc6048df6fad758f2078b429dce28d8 (patch) | |
tree | 4e2c6dc0189676283ad7472aec143c529e447d79 | |
parent | abef1b01eda902b24ece456d4e3fa833add9dcbc (diff) | |
download | libmicrohttpd-d49359450cc6048df6fad758f2078b429dce28d8.tar.gz libmicrohttpd-d49359450cc6048df6fad758f2078b429dce28d8.zip |
daemon.c: minor marcos refactoring for clarity
-rw-r--r-- | src/microhttpd/daemon.c | 16 |
1 files 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 | |||
167 | MHD_init(void); | 167 | MHD_init(void); |
168 | 168 | ||
169 | 169 | ||
170 | #if defined(_WIN32) && ! defined(__CYGWIN__) | 170 | #if defined(MHD_WINSOCK_SOCKETS) |
171 | /** | 171 | /** |
172 | * Track initialization of winsock | 172 | * Track initialization of winsock |
173 | */ | 173 | */ |
174 | static int mhd_winsock_inited_ = 0; | 174 | static int mhd_winsock_inited_ = 0; |
175 | #endif | 175 | #endif /* MHD_WINSOCK_SOCKETS */ |
176 | 176 | ||
177 | #ifdef _AUTOINIT_FUNCS_ARE_SUPPORTED | 177 | #ifdef _AUTOINIT_FUNCS_ARE_SUPPORTED |
178 | /** | 178 | /** |
@@ -7132,20 +7132,20 @@ static struct gcry_thread_cbs gcry_threads_w32 = { | |||
7132 | void | 7132 | void |
7133 | MHD_init(void) | 7133 | MHD_init(void) |
7134 | { | 7134 | { |
7135 | #if defined(_WIN32) && ! defined(__CYGWIN__) | 7135 | #if defined(MHD_WINSOCK_SOCKETS) |
7136 | WSADATA wsd; | 7136 | WSADATA wsd; |
7137 | #endif /* _WIN32 && ! __CYGWIN__ */ | 7137 | #endif /* MHD_WINSOCK_SOCKETS */ |
7138 | 7138 | ||
7139 | if (NULL == mhd_panic) | 7139 | if (NULL == mhd_panic) |
7140 | mhd_panic = &mhd_panic_std; | 7140 | mhd_panic = &mhd_panic_std; |
7141 | 7141 | ||
7142 | #if defined(_WIN32) && ! defined(__CYGWIN__) | 7142 | #if defined(MHD_WINSOCK_SOCKETS) |
7143 | if (0 != WSAStartup(MAKEWORD(2, 2), &wsd)) | 7143 | if (0 != WSAStartup(MAKEWORD(2, 2), &wsd)) |
7144 | MHD_PANIC (_("Failed to initialize winsock\n")); | 7144 | MHD_PANIC (_("Failed to initialize winsock\n")); |
7145 | mhd_winsock_inited_ = 1; | 7145 | mhd_winsock_inited_ = 1; |
7146 | if (2 != LOBYTE(wsd.wVersion) && 2 != HIBYTE(wsd.wVersion)) | 7146 | if (2 != LOBYTE(wsd.wVersion) && 2 != HIBYTE(wsd.wVersion)) |
7147 | MHD_PANIC (_("Winsock version 2.2 is not available\n")); | 7147 | MHD_PANIC (_("Winsock version 2.2 is not available\n")); |
7148 | #endif | 7148 | #endif /* MHD_WINSOCK_SOCKETS */ |
7149 | #ifdef HTTPS_SUPPORT | 7149 | #ifdef HTTPS_SUPPORT |
7150 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 7150 | #ifdef MHD_HTTPS_REQUIRE_GRYPT |
7151 | #if GCRYPT_VERSION_NUMBER < 0x010600 | 7151 | #if GCRYPT_VERSION_NUMBER < 0x010600 |
@@ -7179,10 +7179,10 @@ MHD_fini(void) | |||
7179 | #ifdef HTTPS_SUPPORT | 7179 | #ifdef HTTPS_SUPPORT |
7180 | gnutls_global_deinit (); | 7180 | gnutls_global_deinit (); |
7181 | #endif /* HTTPS_SUPPORT */ | 7181 | #endif /* HTTPS_SUPPORT */ |
7182 | #if defined(_WIN32) && ! defined(__CYGWIN__) | 7182 | #if defined(MHD_WINSOCK_SOCKETS) |
7183 | if (mhd_winsock_inited_) | 7183 | if (mhd_winsock_inited_) |
7184 | WSACleanup(); | 7184 | WSACleanup(); |
7185 | #endif | 7185 | #endif /* MHD_WINSOCK_SOCKETS */ |
7186 | MHD_monotonic_sec_counter_finish(); | 7186 | MHD_monotonic_sec_counter_finish(); |
7187 | } | 7187 | } |
7188 | 7188 | ||