com php-src: Avoid mixing declarations and code: ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Mon, 18 Feb 2013 08:33:58 +0000 |
| Subject: | com php-src: Avoid mixing declarations and code: ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71532@lists.php.net to get a copy of this message | ||
Commit: d9ba147e5c460dcc9d8f6ed2330c816e748a98a7
Author: Dmitry Stogov <dmitry@zend.com> Mon, 18 Feb 2013 12:33:58 +0400
Parents: a1201785208cc953ed0d9bd793976ab722848649
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d9ba147e5c460dcc9d8f6ed2330c816e748a98a7
Log:
Avoid mixing declarations and code
Changed paths:
M ZendAccelerator.c
Diff:
diff --git a/ZendAccelerator.c b/ZendAccelerator.c
index 033c7af..2fb8755 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);
}