diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-06-02 10:08:05 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2015-06-02 10:08:05 +0000 |
commit | 4d75ef33219d976bdc3e053c872c752d457872a2 (patch) | |
tree | dc6b84ec8872b68d7ec584faa799ddb05190cca5 | |
parent | 689d2dc98d2d24fb2da79db5fa08a83bc98cdb8b (diff) | |
download | libmicrohttpd-4d75ef33219d976bdc3e053c872c752d457872a2.tar.gz libmicrohttpd-4d75ef33219d976bdc3e053c872c752d457872a2.zip |
Unify and correct usage of WINDOWS/CYGWIN/MHD_WINSOCK_SOCKETS macros
-rw-r--r-- | src/include/platform_interface.h | 10 | ||||
-rw-r--r-- | src/microhttpd/daemon.c | 26 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/include/platform_interface.h b/src/include/platform_interface.h index 9e63f7a7..766cd3aa 100644 --- a/src/include/platform_interface.h +++ b/src/include/platform_interface.h | |||
@@ -82,14 +82,14 @@ | |||
82 | 82 | ||
83 | 83 | ||
84 | /* MHD_socket_close_(fd) close any FDs (non-W32) / close only socket FDs (W32) */ | 84 | /* MHD_socket_close_(fd) close any FDs (non-W32) / close only socket FDs (W32) */ |
85 | #if !defined(_WIN32) || defined(__CYGWIN__) | 85 | #if !defined(MHD_WINSOCK_SOCKETS) |
86 | #define MHD_socket_close_(fd) close((fd)) | 86 | #define MHD_socket_close_(fd) close((fd)) |
87 | #else | 87 | #else |
88 | #define MHD_socket_close_(fd) closesocket((fd)) | 88 | #define MHD_socket_close_(fd) closesocket((fd)) |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | /* MHD_socket_errno_ is errno of last function (non-W32) / errno of last socket function (W32) */ | 91 | /* MHD_socket_errno_ is errno of last function (non-W32) / errno of last socket function (W32) */ |
92 | #if !defined(_WIN32) || defined(__CYGWIN__) | 92 | #if !defined(MHD_WINSOCK_SOCKETS) |
93 | #define MHD_socket_errno_ errno | 93 | #define MHD_socket_errno_ errno |
94 | #else | 94 | #else |
95 | #define MHD_socket_errno_ MHD_W32_errno_from_winsock_() | 95 | #define MHD_socket_errno_ MHD_W32_errno_from_winsock_() |
@@ -97,21 +97,21 @@ | |||
97 | 97 | ||
98 | /* MHD_socket_last_strerr_ is description string of last errno (non-W32) / | 98 | /* MHD_socket_last_strerr_ is description string of last errno (non-W32) / |
99 | * description string of last socket error (W32) */ | 99 | * description string of last socket error (W32) */ |
100 | #if !defined(_WIN32) || defined(__CYGWIN__) | 100 | #if !defined(MHD_WINSOCK_SOCKETS) |
101 | #define MHD_socket_last_strerr_() strerror(errno) | 101 | #define MHD_socket_last_strerr_() strerror(errno) |
102 | #else | 102 | #else |
103 | #define MHD_socket_last_strerr_() MHD_W32_strerror_last_winsock_() | 103 | #define MHD_socket_last_strerr_() MHD_W32_strerror_last_winsock_() |
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | /* MHD_strerror_ is strerror (both non-W32/W32) */ | 106 | /* MHD_strerror_ is strerror (both non-W32/W32) */ |
107 | #if !defined(_WIN32) || defined(__CYGWIN__) | 107 | #if !defined(MHD_WINSOCK_SOCKETS) |
108 | #define MHD_strerror_(errnum) strerror((errnum)) | 108 | #define MHD_strerror_(errnum) strerror((errnum)) |
109 | #else | 109 | #else |
110 | #define MHD_strerror_(errnum) MHD_W32_strerror_((errnum)) | 110 | #define MHD_strerror_(errnum) MHD_W32_strerror_((errnum)) |
111 | #endif | 111 | #endif |
112 | 112 | ||
113 | /* MHD_set_socket_errno_ set errno to errnum (non-W32) / set socket last error to errnum (W32) */ | 113 | /* MHD_set_socket_errno_ set errno to errnum (non-W32) / set socket last error to errnum (W32) */ |
114 | #if !defined(_WIN32) || defined(__CYGWIN__) | 114 | #if !defined(MHD_WINSOCK_SOCKETS) |
115 | #define MHD_set_socket_errno_(errnum) errno=(errnum) | 115 | #define MHD_set_socket_errno_(errnum) errno=(errnum) |
116 | #else | 116 | #else |
117 | #define MHD_set_socket_errno_(errnum) MHD_W32_set_last_winsock_error_((errnum)) | 117 | #define MHD_set_socket_errno_(errnum) MHD_W32_set_last_winsock_error_((errnum)) |
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 1aa7d8d3..58bbebfc 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -73,7 +73,7 @@ | |||
73 | /** | 73 | /** |
74 | * Default connection limit. | 74 | * Default connection limit. |
75 | */ | 75 | */ |
76 | #ifndef WINDOWS | 76 | #ifndef MHD_WINSOCK_SOCKETS |
77 | #define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE - 4 | 77 | #define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE - 4 |
78 | #else | 78 | #else |
79 | #define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE | 79 | #define MHD_MAX_CONNECTIONS_DEFAULT FD_SETSIZE |
@@ -1271,7 +1271,7 @@ internal_add_connection (struct MHD_Daemon *daemon, | |||
1271 | return MHD_NO; | 1271 | return MHD_NO; |
1272 | } | 1272 | } |
1273 | 1273 | ||
1274 | #ifndef WINDOWS | 1274 | #ifndef MHD_WINSOCK_SOCKETS |
1275 | if ( (client_socket >= FD_SETSIZE) && | 1275 | if ( (client_socket >= FD_SETSIZE) && |
1276 | (0 == (daemon->options & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) ) | 1276 | (0 == (daemon->options & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) ) |
1277 | { | 1277 | { |
@@ -1418,7 +1418,7 @@ internal_add_connection (struct MHD_Daemon *daemon, | |||
1418 | #endif | 1418 | #endif |
1419 | { | 1419 | { |
1420 | /* make socket non-blocking */ | 1420 | /* make socket non-blocking */ |
1421 | #if !defined(WINDOWS) || defined(CYGWIN) | 1421 | #if !defined(MHD_WINSOCK_SOCKETS) |
1422 | int flags = fcntl (connection->socket_fd, F_GETFL); | 1422 | int flags = fcntl (connection->socket_fd, F_GETFL); |
1423 | if ( (-1 == flags) || | 1423 | if ( (-1 == flags) || |
1424 | (0 != fcntl (connection->socket_fd, F_SETFL, flags | O_NONBLOCK)) ) | 1424 | (0 != fcntl (connection->socket_fd, F_SETFL, flags | O_NONBLOCK)) ) |
@@ -1797,7 +1797,7 @@ static void | |||
1797 | make_nonblocking_noninheritable (struct MHD_Daemon *daemon, | 1797 | make_nonblocking_noninheritable (struct MHD_Daemon *daemon, |
1798 | MHD_socket sock) | 1798 | MHD_socket sock) |
1799 | { | 1799 | { |
1800 | #ifdef WINDOWS | 1800 | #ifdef MHD_WINSOCK_SOCKETS |
1801 | DWORD dwFlags; | 1801 | DWORD dwFlags; |
1802 | unsigned long flags = 1; | 1802 | unsigned long flags = 1; |
1803 | 1803 | ||
@@ -3611,7 +3611,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
3611 | daemon->socket_fd = MHD_INVALID_SOCKET; | 3611 | daemon->socket_fd = MHD_INVALID_SOCKET; |
3612 | daemon->listening_address_reuse = 0; | 3612 | daemon->listening_address_reuse = 0; |
3613 | daemon->options = flags; | 3613 | daemon->options = flags; |
3614 | #if WINDOWS | 3614 | #if defined(MHD_WINSOCK_SOCKETS) || defined(CYGWIN) |
3615 | /* Winsock is broken with respect to 'shutdown'; | 3615 | /* Winsock is broken with respect to 'shutdown'; |
3616 | this disables us calling 'shutdown' on W32. */ | 3616 | this disables us calling 'shutdown' on W32. */ |
3617 | daemon->options |= MHD_USE_EPOLL_TURBO; | 3617 | daemon->options |= MHD_USE_EPOLL_TURBO; |
@@ -3650,7 +3650,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
3650 | free (daemon); | 3650 | free (daemon); |
3651 | return NULL; | 3651 | return NULL; |
3652 | } | 3652 | } |
3653 | #ifndef WINDOWS | 3653 | #ifndef MHD_WINSOCK_SOCKETS |
3654 | if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && | 3654 | if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && |
3655 | (1 == use_pipe) && | 3655 | (1 == use_pipe) && |
3656 | (daemon->wpipe[0] >= FD_SETSIZE) ) | 3656 | (daemon->wpipe[0] >= FD_SETSIZE) ) |
@@ -3934,7 +3934,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
3934 | (http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx); | 3934 | (http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx); |
3935 | and may also be missing on older POSIX systems; good luck if you have any of those, | 3935 | and may also be missing on older POSIX systems; good luck if you have any of those, |
3936 | your IPv6 socket may then also bind against IPv4 anyway... */ | 3936 | your IPv6 socket may then also bind against IPv4 anyway... */ |
3937 | #ifndef WINDOWS | 3937 | #ifndef MHD_WINSOCK_SOCKETS |
3938 | const int | 3938 | const int |
3939 | #else | 3939 | #else |
3940 | const char | 3940 | const char |
@@ -4016,7 +4016,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4016 | { | 4016 | { |
4017 | socket_fd = daemon->socket_fd; | 4017 | socket_fd = daemon->socket_fd; |
4018 | } | 4018 | } |
4019 | #ifndef WINDOWS | 4019 | #ifndef MHD_WINSOCK_SOCKETS |
4020 | if ( (socket_fd >= FD_SETSIZE) && | 4020 | if ( (socket_fd >= FD_SETSIZE) && |
4021 | (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY)) ) ) | 4021 | (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY)) ) ) |
4022 | { | 4022 | { |
@@ -4121,7 +4121,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4121 | if ( (daemon->worker_pool_size > 0) && | 4121 | if ( (daemon->worker_pool_size > 0) && |
4122 | (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) ) | 4122 | (0 == (daemon->options & MHD_USE_NO_LISTEN_SOCKET)) ) |
4123 | { | 4123 | { |
4124 | #if !defined(WINDOWS) || defined(CYGWIN) | 4124 | #if !defined(MHD_WINSOCK_SOCKETS) |
4125 | int sk_flags; | 4125 | int sk_flags; |
4126 | #else | 4126 | #else |
4127 | unsigned long sk_flags; | 4127 | unsigned long sk_flags; |
@@ -4140,7 +4140,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4140 | /* Accept must be non-blocking. Multiple children may wake up | 4140 | /* Accept must be non-blocking. Multiple children may wake up |
4141 | * to handle a new connection, but only one will win the race. | 4141 | * to handle a new connection, but only one will win the race. |
4142 | * The others must immediately return. */ | 4142 | * The others must immediately return. */ |
4143 | #if !defined(WINDOWS) || defined(CYGWIN) | 4143 | #if !defined(MHD_WINSOCK_SOCKETS) |
4144 | sk_flags = fcntl (socket_fd, F_GETFL); | 4144 | sk_flags = fcntl (socket_fd, F_GETFL); |
4145 | if (sk_flags < 0) | 4145 | if (sk_flags < 0) |
4146 | goto thread_failed; | 4146 | goto thread_failed; |
@@ -4150,7 +4150,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4150 | sk_flags = 1; | 4150 | sk_flags = 1; |
4151 | if (SOCKET_ERROR == ioctlsocket (socket_fd, FIONBIO, &sk_flags)) | 4151 | if (SOCKET_ERROR == ioctlsocket (socket_fd, FIONBIO, &sk_flags)) |
4152 | goto thread_failed; | 4152 | goto thread_failed; |
4153 | #endif /* WINDOWS && !CYGWIN */ | 4153 | #endif /* MHD_WINSOCK_SOCKETS */ |
4154 | 4154 | ||
4155 | /* Allocate memory for pooled objects */ | 4155 | /* Allocate memory for pooled objects */ |
4156 | daemon->worker_pool = malloc (sizeof (struct MHD_Daemon) | 4156 | daemon->worker_pool = malloc (sizeof (struct MHD_Daemon) |
@@ -4182,7 +4182,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4182 | #endif | 4182 | #endif |
4183 | goto thread_failed; | 4183 | goto thread_failed; |
4184 | } | 4184 | } |
4185 | #ifndef WINDOWS | 4185 | #ifndef MHD_WINSOCK_SOCKETS |
4186 | if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && | 4186 | if ( (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL_LINUX_ONLY))) && |
4187 | (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) && | 4187 | (MHD_USE_SUSPEND_RESUME == (flags & MHD_USE_SUSPEND_RESUME)) && |
4188 | (d->wpipe[0] >= FD_SETSIZE) ) | 4188 | (d->wpipe[0] >= FD_SETSIZE) ) |
@@ -4343,7 +4343,7 @@ close_all_connections (struct MHD_Daemon *daemon) | |||
4343 | { | 4343 | { |
4344 | shutdown (pos->socket_fd, | 4344 | shutdown (pos->socket_fd, |
4345 | (pos->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR); | 4345 | (pos->read_closed == MHD_YES) ? SHUT_WR : SHUT_RDWR); |
4346 | #if WINDOWS | 4346 | #if MHD_WINSOCK_SOCKETS |
4347 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && | 4347 | if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && |
4348 | (MHD_INVALID_PIPE_ != daemon->wpipe[1]) && | 4348 | (MHD_INVALID_PIPE_ != daemon->wpipe[1]) && |
4349 | (1 != MHD_pipe_write_ (daemon->wpipe[1], "e", 1)) ) | 4349 | (1 != MHD_pipe_write_ (daemon->wpipe[1], "e", 1)) ) |