diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-03 14:31:42 +0000 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2016-10-03 14:31:42 +0000 |
commit | ebbf25eb5bb006cd58ad5dd76d490eb2d0db7d76 (patch) | |
tree | 95c39ec32099275f2f443773caa2c83b17b96457 /src/microhttpd | |
parent | 4f86276385dfd9fcbac0b7d774a8f69d9fea7bcf (diff) | |
download | libmicrohttpd-ebbf25eb5bb006cd58ad5dd76d490eb2d0db7d76.tar.gz libmicrohttpd-ebbf25eb5bb006cd58ad5dd76d490eb2d0db7d76.zip |
daemon.c: fix compiling with new ITC
Diffstat (limited to 'src/microhttpd')
-rw-r--r-- | src/microhttpd/daemon.c | 4 | ||||
-rw-r--r-- | src/microhttpd/mhd_itc.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 239a19ea..e6477692 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -1370,7 +1370,7 @@ thread_main_handle_connection (void *data) | |||
1370 | goto exit; | 1370 | goto exit; |
1371 | } | 1371 | } |
1372 | #if WINDOWS | 1372 | #if WINDOWS |
1373 | if (! MHD_INVALID_PIPE_(deamon->wpipe) ) | 1373 | if (! MHD_INVALID_PIPE_(daemon->wpipe) ) |
1374 | { | 1374 | { |
1375 | if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_ (daemon->wpipe), | 1375 | if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_ (daemon->wpipe), |
1376 | &rs, | 1376 | &rs, |
@@ -2852,7 +2852,7 @@ MHD_select (struct MHD_Daemon *daemon, | |||
2852 | { | 2852 | { |
2853 | FD_CLR (daemon->socket_fd, | 2853 | FD_CLR (daemon->socket_fd, |
2854 | &rs); | 2854 | &rs); |
2855 | if (! MHD_add_to_fd_set_ (daemon->wpipe[0], | 2855 | if (! MHD_add_to_fd_set_ (MHD_pipe_get_read_fd_(daemon->wpipe), |
2856 | &rs, | 2856 | &rs, |
2857 | &maxsock, | 2857 | &maxsock, |
2858 | FD_SETSIZE)) | 2858 | FD_SETSIZE)) |
diff --git a/src/microhttpd/mhd_itc.h b/src/microhttpd/mhd_itc.h index 3a05c4ec..6d295619 100644 --- a/src/microhttpd/mhd_itc.h +++ b/src/microhttpd/mhd_itc.h | |||
@@ -244,9 +244,9 @@ struct MHD_Pipe | |||
244 | /** | 244 | /** |
245 | * Close emulated pipe FDs | 245 | * Close emulated pipe FDs |
246 | */ | 246 | */ |
247 | #define MHD_pipe_close_(fd) do { \ | 247 | #define MHD_pipe_close_(pip) do { \ |
248 | MHD_socket_close_ (pip.fd[0]); \ | 248 | MHD_socket_close_ ((pip).fd[0]); \ |
249 | MHD_socket_close_ (pip.fd[1]); \ | 249 | MHD_socket_close_ ((pip).fd[1]); \ |
250 | } while (0) | 250 | } while (0) |
251 | 251 | ||
252 | /** | 252 | /** |