diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 68491938..076a7ada 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -1131,7 +1131,7 @@ recv_param_adapter (struct MHD_Connection *connection, | |||
1131 | 1131 | ||
1132 | ret = (ssize_t) recv (connection->socket_fd, | 1132 | ret = (ssize_t) recv (connection->socket_fd, |
1133 | other, | 1133 | other, |
1134 | (_MHD_socket_funcs_size) i, | 1134 | (MHD_SCKT_SEND_SIZE_) i, |
1135 | MSG_NOSIGNAL); | 1135 | MSG_NOSIGNAL); |
1136 | #if EPOLL_SUPPORT | 1136 | #if EPOLL_SUPPORT |
1137 | if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_ (MHD_socket_get_error_ ())) ) | 1137 | if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_ (MHD_socket_get_error_ ())) ) |
@@ -1180,7 +1180,7 @@ send_param_adapter (struct MHD_Connection *connection, | |||
1180 | if (0 != (connection->daemon->options & MHD_USE_SSL)) | 1180 | if (0 != (connection->daemon->options & MHD_USE_SSL)) |
1181 | return (ssize_t) send (connection->socket_fd, | 1181 | return (ssize_t) send (connection->socket_fd, |
1182 | other, | 1182 | other, |
1183 | (_MHD_socket_funcs_size) i, | 1183 | (MHD_SCKT_SEND_SIZE_) i, |
1184 | MSG_NOSIGNAL); | 1184 | MSG_NOSIGNAL); |
1185 | #if LINUX | 1185 | #if LINUX |
1186 | if ( (connection->write_buffer_append_offset == | 1186 | if ( (connection->write_buffer_append_offset == |
@@ -1232,7 +1232,7 @@ send_param_adapter (struct MHD_Connection *connection, | |||
1232 | http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */ | 1232 | http://lists.gnu.org/archive/html/libmicrohttpd/2011-02/msg00015.html */ |
1233 | } | 1233 | } |
1234 | #endif | 1234 | #endif |
1235 | ret = (ssize_t) send (connection->socket_fd, other, (_MHD_socket_funcs_size)i, MSG_NOSIGNAL); | 1235 | ret = (ssize_t) send (connection->socket_fd, other, (MHD_SCKT_SEND_SIZE_)i, MSG_NOSIGNAL); |
1236 | err = MHD_socket_get_error_(); | 1236 | err = MHD_socket_get_error_(); |
1237 | #if EPOLL_SUPPORT | 1237 | #if EPOLL_SUPPORT |
1238 | if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_(err)) ) | 1238 | if ( (0 > ret) && (MHD_SCKT_ERR_IS_EAGAIN_(err)) ) |
@@ -3667,7 +3667,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
3667 | MHD_AccessHandlerCallback dh, void *dh_cls, | 3667 | MHD_AccessHandlerCallback dh, void *dh_cls, |
3668 | va_list ap) | 3668 | va_list ap) |
3669 | { | 3669 | { |
3670 | const _MHD_SOCKOPT_BOOL_TYPE on = 1; | 3670 | const MHD_SCKT_OPT_BOOL_ on = 1; |
3671 | struct MHD_Daemon *daemon; | 3671 | struct MHD_Daemon *daemon; |
3672 | MHD_socket socket_fd; | 3672 | MHD_socket socket_fd; |
3673 | struct sockaddr_in servaddr4; | 3673 | struct sockaddr_in servaddr4; |
@@ -4056,7 +4056,7 @@ MHD_start_daemon_va (unsigned int flags, | |||
4056 | (http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx); | 4056 | (http://msdn.microsoft.com/en-us/library/ms738574%28v=VS.85%29.aspx); |
4057 | and may also be missing on older POSIX systems; good luck if you have any of those, | 4057 | and may also be missing on older POSIX systems; good luck if you have any of those, |
4058 | your IPv6 socket may then also bind against IPv4 anyway... */ | 4058 | your IPv6 socket may then also bind against IPv4 anyway... */ |
4059 | const _MHD_SOCKOPT_BOOL_TYPE v6_only = | 4059 | const MHD_SCKT_OPT_BOOL_ v6_only = |
4060 | (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)); | 4060 | (MHD_USE_DUAL_STACK != (flags & MHD_USE_DUAL_STACK)); |
4061 | if (0 > setsockopt (socket_fd, | 4061 | if (0 > setsockopt (socket_fd, |
4062 | IPPROTO_IPV6, IPV6_V6ONLY, | 4062 | IPPROTO_IPV6, IPV6_V6ONLY, |