mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison) Conflicts: NEWS
This commit is contained in:
commit
b6864d978c
@ -28,8 +28,8 @@
|
||||
# define VAR_NUM(v) ((zend_uint)(EX_TMP_VAR_NUM(0, 0) - EX_TMP_VAR(0, v)))
|
||||
# define NUM_VAR(v) ((zend_uint)(zend_uintptr_t)EX_TMP_VAR_NUM(0, v))
|
||||
#else
|
||||
# define VAR_NUM(v) ((v)/(sizeof(temp_variable)))
|
||||
# define NUM_VAR(v) ((v)*(sizeof(temp_variable)))
|
||||
# define VAR_NUM(v) ((v)/ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))
|
||||
# define NUM_VAR(v) ((v)*ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))
|
||||
#endif
|
||||
|
||||
#define INV_COND(op) ((op) == ZEND_JMPZ ? ZEND_JMPNZ : ZEND_JMPZ)
|
||||
|
Loading…
Reference in New Issue
Block a user