aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-11-02 13:15:38 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2016-11-02 15:53:51 +0300
commit82ebcd2dbfb0a836383927c64a7d525e3941924a (patch)
tree125c7cd4692836dedf3a23a9739f03e7553e41aa
parent7cad8fc50e5ad30f6d3e38b20f2cbb2d8d7a0aa0 (diff)
downloadlibmicrohttpd-82ebcd2dbfb0a836383927c64a7d525e3941924a.tar.gz
libmicrohttpd-82ebcd2dbfb0a836383927c64a7d525e3941924a.zip
MHD_start_daemon_va(): fixed 'ifdef' ordering
-rw-r--r--src/microhttpd/daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 9bd32607..31aa0bcd 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5363,8 +5363,8 @@ thread_failed:
5363 free_and_fail: 5363 free_and_fail:
5364 /* clean up basic memory state in 'daemon' and return NULL to 5364 /* clean up basic memory state in 'daemon' and return NULL to
5365 indicate failure */ 5365 indicate failure */
5366#ifdef HTTPS_SUPPORT
5367#ifdef EPOLL_SUPPORT 5366#ifdef EPOLL_SUPPORT
5367#ifdef HTTPS_SUPPORT
5368 if (MHD_YES == daemon->upgrade_fd_in_epoll) 5368 if (MHD_YES == daemon->upgrade_fd_in_epoll)
5369 { 5369 {
5370 if (0 != epoll_ctl (daemon->epoll_fd, 5370 if (0 != epoll_ctl (daemon->epoll_fd,
@@ -5374,14 +5374,14 @@ thread_failed:
5374 MHD_PANIC (_("Failed to remove FD from epoll set\n")); 5374 MHD_PANIC (_("Failed to remove FD from epoll set\n"));
5375 daemon->upgrade_fd_in_epoll = MHD_NO; 5375 daemon->upgrade_fd_in_epoll = MHD_NO;
5376 } 5376 }
5377#endif /* HTTPS_SUPPORT */
5377 if (-1 != daemon->epoll_fd) 5378 if (-1 != daemon->epoll_fd)
5378 close (daemon->epoll_fd); 5379 close (daemon->epoll_fd);
5379#ifdef HTTPS_SUPPORT 5380#ifdef HTTPS_SUPPORT
5380 if (-1 != daemon->epoll_upgrade_fd) 5381 if (-1 != daemon->epoll_upgrade_fd)
5381 close (daemon->epoll_upgrade_fd); 5382 close (daemon->epoll_upgrade_fd);
5382#endif /* HTTPS_SUPPORT */ 5383#endif /* HTTPS_SUPPORT */
5383#endif 5384#endif /* EPOLL_SUPPORT */
5384#endif /* HTTPS_SUPPORT */
5385#ifdef DAUTH_SUPPORT 5385#ifdef DAUTH_SUPPORT
5386 free (daemon->nnc); 5386 free (daemon->nnc);
5387 MHD_mutex_destroy_chk_ (&daemon->nnc_lock); 5387 MHD_mutex_destroy_chk_ (&daemon->nnc_lock);