libmicrohttpd

commit 892de4180293ba68b74858580af6790fd4635ddc
parent a0118ad4e17359e8b1d836aec2d40b43d414c1d3
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  4 Nov 2016 14:40:15 +0100

change order to reduce #ifdef'ing

Diffstat:
M
src/microhttpd/daemon.c
 | 
8
+++-----

1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -5448,16 +5448,14 @@ close_all_connections (struct MHD_Daemon *daemon)
 {
   struct MHD_Connection *pos;
   const _MHD_bool used_thr_p_c = (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION));
+#ifdef UPGRADE_SUPPORT
+  const _MHD_bool upg_allowed = (0 != (daemon->options & MHD_ALLOW_UPGRADE));
+#endif /* UPGRADE_SUPPORT */
 #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
   struct MHD_UpgradeResponseHandle *urh;
   struct MHD_UpgradeResponseHandle *urhn;
   const _MHD_bool used_tls = (0 != (daemon->options & MHD_USE_TLS));
-#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
-#ifdef UPGRADE_SUPPORT
-  const _MHD_bool upg_allowed = (0 != (daemon->options & MHD_ALLOW_UPGRADE));
-#endif /* UPGRADE_SUPPORT */
 
-#if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
   /* give upgraded HTTPS connections a chance to finish */
   /* 'daemon->urh_head' is not used in thread-per-connection mode. */
   for (urh = daemon->urh_head; NULL != urh; urh = urhn)