From: Dmitry Stogov Date: Mon, 18 Feb 2013 08:33:58 +0000 (+0400) Subject: Avoid mixing declarations and code X-Git-Tag: php-5.5.0beta1~42^2~61 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9ba147e5c460dcc9d8f6ed2330c816e748a98a7;p=php Avoid mixing declarations and code --- diff --git a/ZendAccelerator.c b/ZendAccelerator.c index 033c7af940..2fb87551aa 100644 --- a/ZendAccelerator.c +++ b/ZendAccelerator.c @@ -460,12 +460,13 @@ static inline void accel_restart_enter(TSRMLS_D) static inline void accel_restart_leave(TSRMLS_D) { - ZCSG(restart_in_progress) = 0; #ifdef ZEND_WIN32 + ZCSG(restart_in_progress) = 0; DECREMENT(restart_in); #else static const FLOCK_STRUCTURE(restart_finished, F_UNLCK, SEEK_SET, 2, 1); + ZCSG(restart_in_progress) = 0; if (fcntl(lock_file, F_SETLK, &restart_finished)==-1) { zend_accel_error(ACCEL_LOG_DEBUG, "RestartC(-1): %s (%d)", strerror(errno), errno); }