summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2013-05-19 13:34:57 -0700
committerSara Golemon <pollita@php.net>2013-05-19 13:34:57 -0700
commit2d7415a4af66e0771b36a10534e304fe7af4a855 (patch)
treecabed5ca70b77895dca89cb6cde796315be9dc5d
parent646ebc2cb9148404ffbccf14413b794f3a1e0688 (diff)
parent2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee (diff)
downloadphp-git-2d7415a4af66e0771b36a10534e304fe7af4a855.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Don't double-quote name of namespaced function.
-rw-r--r--Zend/zend_API.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 62bf391ca5..cf3895b102 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)