Introduce ZEND_ME() and ZEND_METHOD() macros. Use these for declaring

class methods to avoid name collisions.

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c3d487951c33b73727ed1a72f5a66208694441a2..83d61893ed8e0cb3efb12ac873f1ed4522b2b773 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -35,11 +35,13 @@ BEGIN_EXTERN_C()
 #define ZEND_FN(name) zif_##name
 #define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)
 #define ZEND_FUNCTION(name) ZEND_NAMED_FUNCTION(ZEND_FN(name))
+#define ZEND_METHOD(class, name) ZEND_NAMED_FUNCTION(ZEND_FN(class##_##name))
 
 #define ZEND_NAMED_FE(zend_name, name, arg_types) { #zend_name, name, arg_types },
 #define ZEND_FE(name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(name), arg_types)
 #define ZEND_FALIAS(name, alias, arg_types) ZEND_NAMED_FE(name, ZEND_FN(alias), arg_types)
 #define ZEND_STATIC_FE(name, impl_name, arg_types) { name, impl_name, arg_types },
+#define ZEND_ME(class, name, arg_types) ZEND_NAMED_FE(name, ZEND_FN(class##_##name), arg_types)
 
 /* Name macros */
 #define ZEND_MODULE_STARTUP_N(module)       zm_startup_##module

diff --git a/main/php.h b/main/php.h
index f02dade94a6aaf062968ed013636eaa21d2e084b..afe7628b8c701b94fb6f8d985dad3f88562a1e4b 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -305,11 +305,13 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 #define PHP_FN                                 ZEND_FN
 #define PHP_NAMED_FUNCTION             ZEND_NAMED_FUNCTION
 #define PHP_FUNCTION                   ZEND_FUNCTION
+#define PHP_METHOD                     ZEND_METHOD
 
 #define PHP_NAMED_FE   ZEND_NAMED_FE
 #define PHP_FE                 ZEND_FE
 #define PHP_FALIAS             ZEND_FALIAS
 #define PHP_STATIC_FE  ZEND_STATIC_FE
+#define PHP_ME          ZEND_ME
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N
 #define PHP_MODULE_SHUTDOWN_N  ZEND_MODULE_SHUTDOWN_N