summaryrefslogtreecommitdiff
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)
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:
free_and_fail:
/* clean up basic memory state in 'daemon' and return NULL to
indicate failure */
-#ifdef HTTPS_SUPPORT
#ifdef EPOLL_SUPPORT
+#ifdef HTTPS_SUPPORT
if (MHD_YES == daemon->upgrade_fd_in_epoll)
{
if (0 != epoll_ctl (daemon->epoll_fd,
@@ -5374,14 +5374,14 @@ thread_failed:
MHD_PANIC (_("Failed to remove FD from epoll set\n"));
daemon->upgrade_fd_in_epoll = MHD_NO;
}
+#endif /* HTTPS_SUPPORT */
if (-1 != daemon->epoll_fd)
close (daemon->epoll_fd);
#ifdef HTTPS_SUPPORT
if (-1 != daemon->epoll_upgrade_fd)
close (daemon->epoll_upgrade_fd);
#endif /* HTTPS_SUPPORT */
-#endif
-#endif /* HTTPS_SUPPORT */
+#endif /* EPOLL_SUPPORT */
#ifdef DAUTH_SUPPORT
free (daemon->nnc);
MHD_mutex_destroy_chk_ (&daemon->nnc_lock);