change order to reduce #ifdef'ing

This commit is contained in:
Christian Grothoff committed 2016-11-04 14:40:15 +01:00
1 parent a0118ad4e1
commit 892de41802
1 file changed
+3 -5
+3 -5
View File
@@ -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)