Re: cvs: php4 /main php.h ZendEngine2 zend_API.h

What's the difference between ZEND_ME() and ZEND_METHOD()? (i.e. what does ME stand for?) At 03:38 PM 4/4/2003 +0000, Andrei Zmievski wrote:

andrei          Fri Apr  4 10:38:20 2003 EDT

Modified files:

    /ZendEngine2        zend_API.h
    /php4/main  php.h

Log: Introduce ZEND_ME() and ZEND_METHOD() macros. Use these for declaring class methods to avoid name collisions. Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.134 ZendEngine2/zend_API.h:1.135

--- ZendEngine2/zend_API.h:1.134        Fri Apr  4 07:25:47 2003
+++ ZendEngine2/zend_API.h      Fri Apr  4 10:38:20 2003

@@ -18,7 +18,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: zend_API.h,v 1.134 2003/04/04 12:25:47 stas Exp $ */ +/* $Id: zend_API.h,v 1.135 2003/04/04 15:38:20 andrei Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -35,11 +35,13 @@ #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

Index: php4/main/php.h diff -u php4/main/php.h:1.183 php4/main/php.h:1.184

--- php4/main/php.h:1.183       Tue Feb 25 04:44:12 2003
+++ php4/main/php.h     Fri Apr  4 10:38:20 2003

@@ -17,7 +17,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: php.h,v 1.183 2003/02/25 09:44:12 sniper Exp $ */ +/* $Id: php.h,v 1.184 2003/04/04 15:38:20 andrei Exp $ */ #ifndef PHP_H #define PHP_H @@ -305,11 +305,13 @@

 #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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php