Patch rename_IS_CALLABLE for memcache Bug #65307
Patch version 2013-07-22 04:53 UTC
Return to Bug #65307 |
Download this patch
Patch Revisions:
Developer: div@justcommunication.ru
--- php_memcache.h-orig Mon Jul 22 15:01:48 2013
+++ php_memcache.h Mon Jul 22 15:07:20 2013
@@ -72,9 +72,9 @@
#define MMC_DEFAULT_CACHEDUMP_LIMIT 100 /* number of entries */
#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
-# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
+# define MMC_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
#else
-# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
+# define MMC_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
#endif
/* internal functions */
--- memcache.c-orig Mon Jul 22 15:07:35 2013
+++ memcache.c Mon Jul 22 15:08:29 2013
@@ -1006,7 +1006,7 @@
/* check for userspace callback */
if (param != NULL && zend_hash_find(Z_OBJPROP_P((zval *)param), "_failureCallback", sizeof("_failureCallback"), (void **)&callback) == SUCCESS && Z_TYPE_PP(callback) != IS_NULL) {
- if (IS_CALLABLE(*callback, 0, NULL)) {
+ if (MMC_IS_CALLABLE(*callback, 0, NULL)) {
zval *retval = NULL;
zval *host, *tcp_port, *udp_port, *error, *errnum;
zval **params[5];
@@ -1233,7 +1233,7 @@
}
if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
- if (!IS_CALLABLE(failure_callback, 0, NULL)) {
+ if (!MMC_IS_CALLABLE(failure_callback, 0, NULL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
RETURN_FALSE;
}
@@ -1295,7 +1295,7 @@
}
if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
- if (!IS_CALLABLE(failure_callback, 0, NULL)) {
+ if (!MMC_IS_CALLABLE(failure_callback, 0, NULL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
RETURN_FALSE;
}
@@ -1360,7 +1360,7 @@
}
if (Z_TYPE_P(failure_callback) != IS_NULL) {
- if (!IS_CALLABLE(failure_callback, 0, NULL)) {
+ if (!MMC_IS_CALLABLE(failure_callback, 0, NULL)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
RETURN_FALSE;
}
|