diff options
| author | Sara Golemon <pollita@php.net> | 2013-05-19 13:35:03 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2013-05-19 13:35:03 -0700 |
| commit | 4f46a40b9df80ef3faf498262c7a06a77ee98041 (patch) | |
| tree | 68ea981b3b24d9b19d8e7ad67547f7ff4b1a254d /Zend/zend_API.h | |
| parent | 4840ff0f05876ee614d17804d2340f2233eb4111 (diff) | |
| parent | 2d7415a4af66e0771b36a10534e304fe7af4a855 (diff) | |
| download | php-git-4f46a40b9df80ef3faf498262c7a06a77ee98041.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Don't double-quote name of namespaced function.
Diffstat (limited to 'Zend/zend_API.h')
| -rw-r--r-- | Zend/zend_API.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 26aa1e6b17..f10fc91704 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache { #define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags) ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags) #define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0) -#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0) +#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0) #define ZEND_NS_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0) #define ZEND_NS_DEP_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED) #define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0) |