com php-src: Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T): ext/opca che/zend_accelerator_util_funcs.c
| From: | Xinchen Hui | Date: | Tue, 14 Jul 2015 10:59:36 +0000 |
| Subject: | com php-src: Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T): ext/opca che/zend_accelerator_util_funcs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87992@lists.php.net to get a copy of this message | ||
Commit: 453ec91dfe0ce53e1867241625958f27fbee17d2
Author: Xinchen Hui <laruence@php.net> Tue, 14 Jul 2015 18:58:43 +0800
Parents: ad929bf68b0f43f38a8a8a2b2b01b64359ffbbee
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=453ec91dfe0ce53e1867241625958f27fbee17d2
Log:
Fixed bug #70067 (Cross-compile failure in opcache when SIZEOF_ZEND_LONG < SIZEOF_SIZE_T)
Bugs:
https://bugs..php.net/70067
Changed paths:
M ext/opcache/zend_accelerator_util_funcs.c
Diff:
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
index 715ef07..e20f3d1 100644
--- a/ext/opcache/zend_accelerator_util_funcs.c
+++ b/ext/opcache/zend_accelerator_util_funcs.c
@@ -30,7 +30,7 @@
# define accel_xlat_set(old, new) zend_hash_index_add_new_ptr(&ZCG(bind_hash),
(zend_ulong)(zend_uintptr_t)(old), (new))
# define accel_xlat_get(old) zend_hash_index_find_ptr(&ZCG(bind_hash),
(zend_ulong)(zend_uintptr_t)(old))
#else
-# define accel_xlat_set(old, new) (zend_hash_str_add_new_ptr(&ZCG(bind_hash),
(char*)&(old), sizeof(void*), (zend_ulong)(zend_uintptr_t)(old), (void**)&(new))
+# define accel_xlat_set(old, new) zend_hash_str_add_new_ptr(&ZCG(bind_hash), (char*)&(old),
sizeof(void*), (old))
# define accel_xlat_get(old) zend_hash_str_find_ptr(&ZCG(bind_hash), (char*)&(old),
sizeof(void*))
#endif