cvs: php4 /main php.h php3_compat.h

zeev Fri Aug 10 21:13:31 2001 EDT Modified files: /php4/main php.h php3_compat.h Log: Move the macro wrappers from the compatibility header to php.h Index: php4/main/php.h diff -u php4/main/php.h:1.151 php4/main/php.h:1.152 --- php4/main/php.h:1.151 Fri Aug 10 08:48:06 2001 +++ php4/main/php.h Fri Aug 10 21:13:31 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.151 2001/08/10 12:48:06 zeev Exp $ */ +/* $Id: php.h,v 1.152 2001/08/11 01:13:31 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -248,6 +248,42 @@ PHPAPI int cfg_get_long(char *varname, long *result); PHPAPI int cfg_get_double(char *varname, double *result); PHPAPI int cfg_get_string(char *varname, char **result); + + +/* PHP-named Zend macro wrappers */ +#define PHP_FN ZEND_FN +#define PHP_NAMED_FUNCTION ZEND_NAMED_FUNCTION +#define PHP_FUNCTION ZEND_FUNCTION + +#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_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N +#define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N +#define PHP_MODULE_ACTIVATE_N ZEND_MODULE_ACTIVATE_N +#define PHP_MODULE_DEACTIVATE_N ZEND_MODULE_DEACTIVATE_N +#define PHP_MODULE_INFO_N ZEND_MODULE_INFO_N + +#define PHP_MODULE_STARTUP_D ZEND_MODULE_STARTUP_D +#define PHP_MODULE_SHUTDOWN_D ZEND_MODULE_SHUTDOWN_D +#define PHP_MODULE_ACTIVATE_D ZEND_MODULE_ACTIVATE_D +#define PHP_MODULE_DEACTIVATE_D ZEND_MODULE_DEACTIVATE_D +#define PHP_MODULE_INFO_D ZEND_MODULE_INFO_D + +/* Compatibility macros */ +#define PHP_MINIT ZEND_MODULE_STARTUP_N +#define PHP_MSHUTDOWN ZEND_MODULE_SHUTDOWN_N +#define PHP_RINIT ZEND_MODULE_ACTIVATE_N +#define PHP_RSHUTDOWN ZEND_MODULE_DEACTIVATE_N +#define PHP_MINFO ZEND_MODULE_INFO_N + +#define PHP_MINIT_FUNCTION ZEND_MODULE_STARTUP_D +#define PHP_MSHUTDOWN_FUNCTION ZEND_MODULE_SHUTDOWN_D +#define PHP_RINIT_FUNCTION ZEND_MODULE_ACTIVATE_D +#define PHP_RSHUTDOWN_FUNCTION ZEND_MODULE_DEACTIVATE_D +#define PHP_MINFO_FUNCTION ZEND_MODULE_INFO_D /* Output support */ Index: php4/main/php3_compat.h diff -u php4/main/php3_compat.h:1.15 php4/main/php3_compat.h:1.16 --- php4/main/php3_compat.h:1.15 Fri Aug 10 10:10:31 2001 +++ php4/main/php3_compat.h Fri Aug 10 21:13:31 2001 @@ -99,26 +99,4 @@ #define list_entry zend_rsrc_list_entry -/* Compatibility macros */ -#define PHP_FN(name) ZEND_FN(name) -#define PHP_NAMED_FUNCTION(name) ZEND_NAMED_FUNCTION(name) -#define PHP_FUNCTION(name) ZEND_FUNCTION(name) - -#define PHP_NAMED_FE(php_name, name, arg_types) ZEND_NAMED_FE(php_name, name, arg_types) -#define PHP_FE(name, arg_types) ZEND_FE(name, arg_types) -#define PHP_FALIAS(name, alias, arg_types) ZEND_FALIAS(name, alias, arg_types) -#define PHP_STATIC_FE(php_name, func_name, arg_types) ZEND_STATIC_FE(php_name, func_name, arg_types) - -#define PHP_MINIT(module) ZEND_MODULE_STARTUP_N(module) -#define PHP_MSHUTDOWN(module) ZEND_MODULE_SHUTDOWN_N(module) -#define PHP_RINIT(module) ZEND_MODULE_ACTIVATE_N(module) -#define PHP_RSHUTDOWN(module) ZEND_MODULE_DEACTIVATE_N(module) -#define PHP_MINFO(module) ZEND_MODULE_INFO_N(module) - -#define PHP_MINIT_FUNCTION(module) ZEND_MODULE_STARTUP_D(module) -#define PHP_MSHUTDOWN_FUNCTION(module) ZEND_MODULE_SHUTDOWN_D(module) -#define PHP_RINIT_FUNCTION(module) ZEND_MODULE_ACTIVATE_D(module) -#define PHP_RSHUTDOWN_FUNCTION(module) ZEND_MODULE_DEACTIVATE_D(module) -#define PHP_MINFO_FUNCTION(module) ZEND_MODULE_INFO_D(module) - #endif /* PHP3_COMPAT_H */