diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:49:43 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:49:43 +0100 |
| commit | 1433854681d8cd37803873b2f891a8d60d77cc3c (patch) | |
| tree | 65c03d30b18ff76eb684c287f1fe4b1c9c4c1591 | |
| parent | 264279439b5707ecbc21ad06c8f48d3ffd6bd862 (diff) | |
| parent | ec53b60072799704a0d94cdd935bdf54bd5e5344 (diff) | |
| download | php-git-1433854681d8cd37803873b2f891a8d60d77cc3c.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | Zend/zend_API.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 4a3985e0f4..ccbdf2c109 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -279,9 +279,9 @@ ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC); #define zend_register_class_alias(name, ce) \ - zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_DC) + zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC) #define zend_register_ns_class_alias(ns, name, ce) \ - zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_DC) + zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC) ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC); ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC); |