Clarify #if indentation in time limit implemementation

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 7606351a0f8e6581cdea0fb1487c9b55be719ce2..f6f1eed26f897c10393f687a682f895d2eca2a79 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1274,8 +1274,7 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals) /* {{{ */
                zend_error_noreturn(E_ERROR, "Could not queue new timer");
                return;
        }
-#else
-#      ifdef HAVE_SETITIMER
+#elif defined(HAVE_SETITIMER)
        {
                struct itimerval t_r;           /* timeout requested */
                int signo;
@@ -1284,39 +1283,38 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals) /* {{{ */
                        t_r.it_value.tv_sec = seconds;
                        t_r.it_value.tv_usec = t_r.it_interval.tv_sec = t_r.it_interval.tv_usec = 0;
 
-#      ifdef __CYGWIN__
+# ifdef __CYGWIN__
                        setitimer(ITIMER_REAL, &t_r, NULL);
                }
                signo = SIGALRM;
-#      else
+# else
                        setitimer(ITIMER_PROF, &t_r, NULL);
                }
                signo = SIGPROF;
-#      endif
+# endif
 
                if (reset_signals) {
-#      ifdef ZEND_SIGNALS
+# ifdef ZEND_SIGNALS
                        zend_signal(signo, zend_timeout_handler);
-#      else
+# else
                        sigset_t sigset;
-#   ifdef HAVE_SIGACTION
+#  ifdef HAVE_SIGACTION
                        struct sigaction act;
 
                        act.sa_handler = zend_timeout_handler;
                        sigemptyset(&act.sa_mask);
                        act.sa_flags = SA_RESETHAND | SA_NODEFER;
                        sigaction(signo, &act, NULL);
-#   else
+#  else
                        signal(signo, zend_timeout_handler);
-#   endif /* HAVE_SIGACTION */
+#  endif /* HAVE_SIGACTION */
                        sigemptyset(&sigset);
                        sigaddset(&sigset, signo);
                        sigprocmask(SIG_UNBLOCK, &sigset, NULL);
-#      endif /* ZEND_SIGNALS */
+# endif /* ZEND_SIGNALS */
                }
        }
-#      endif /* HAVE_SETITIMER */
-#endif
+#endif /* HAVE_SETITIMER */
 }
 /* }}} */
 
@@ -1341,23 +1339,20 @@ void zend_unset_timeout(void) /* {{{ */
                }
                tq_timer = NULL;
        }
-       EG(timed_out) = 0;
-#else
-#      ifdef HAVE_SETITIMER
+#elif defined(HAVE_SETITIMER)
        if (EG(timeout_seconds)) {
                struct itimerval no_timeout;
 
                no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
 
-#ifdef __CYGWIN__
+# ifdef __CYGWIN__
                setitimer(ITIMER_REAL, &no_timeout, NULL);
-#else
+# else
                setitimer(ITIMER_PROF, &no_timeout, NULL);
-#endif
+# endif
        }
-#      endif
-       EG(timed_out) = 0;
 #endif
+       EG(timed_out) = 0;
 }
 /* }}} */