From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 10 May 2016 14:53:33 +0000 (+0300)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.8RC1~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7372f648fdf9ea91e2414b394f786a01f7f0496;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  The "flock" structure has to be writable on AIX.
---

f7372f648fdf9ea91e2414b394f786a01f7f0496
diff --cc ext/opcache/ZendAccelerator.c
index 8eddb4b76e,418b4a3add..fab8975b98
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -305,12 -576,16 +321,16 @@@ static inline void accel_deactivate_sub
  #endif
  }
  
 -static inline void accel_unlock_all(TSRMLS_D)
 +static inline void accel_unlock_all(void)
  {
  #ifdef ZEND_WIN32
 -	accel_deactivate_sub(TSRMLS_C);
 +	accel_deactivate_sub();
  #else
+ # ifdef _AIX
+ 	static FLOCK_STRUCTURE(mem_usage_unlock_all, F_UNLCK, SEEK_SET, 0, 0);
+ # else
  	static const FLOCK_STRUCTURE(mem_usage_unlock_all, F_UNLCK, SEEK_SET, 0, 0);
+ # endif
  
  	if (fcntl(lock_file, F_SETLK, &mem_usage_unlock_all) == -1) {
  		zend_accel_error(ACCEL_LOG_DEBUG, "UnlockAll:  %s (%d)", strerror(errno), errno);