cvs: php4 /main php.h php3_compat.h

zeev Fri Aug 10 08:48:06 2001 EDT Modified files: /php4/main php.h php3_compat.h Log: Centralize macros Index: php4/main/php.h diff -u php4/main/php.h:1.150 php4/main/php.h:1.151 --- php4/main/php.h:1.150 Fri Aug 10 08:27:33 2001 +++ php4/main/php.h Fri Aug 10 08:48:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.150 2001/08/10 12:27:33 zeev Exp $ */ +/* $Id: php.h,v 1.151 2001/08/10 12:48:06 zeev Exp $ */ #ifndef PHP_H #define PHP_H @@ -206,27 +206,6 @@ # define MAXPATHLEN 256 /* Should be safe for any weird systems that do not define it */ # endif #endif - -#define PHP_FN(name) php_if_##name -#define PHP_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS) -#define PHP_FUNCTION(name) PHP_NAMED_FUNCTION(PHP_FN(name)) - -#define PHP_NAMED_FE(php_name, name, arg_types) { #php_name, name, arg_types }, -#define PHP_FE(name, arg_types) PHP_NAMED_FE(name, PHP_FN(name), arg_types) -#define PHP_FALIAS(name, alias, arg_types) PHP_NAMED_FE(name, PHP_FN(alias), arg_types) -#define PHP_STATIC_FE(php_name, func_name, arg_types) { php_name, func_name, arg_types }, - -#define PHP_MINIT(module) php_minit_##module -#define PHP_MSHUTDOWN(module) php_mshutdown_##module -#define PHP_RINIT(module) php_rinit_##module -#define PHP_RSHUTDOWN(module) php_rshutdown_##module -#define PHP_MINFO(module) php_info_##module - -#define PHP_MINIT_FUNCTION(module) int PHP_MINIT(module)(INIT_FUNC_ARGS) -#define PHP_MSHUTDOWN_FUNCTION(module) int PHP_MSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) -#define PHP_RINIT_FUNCTION(module) int PHP_RINIT(module)(INIT_FUNC_ARGS) -#define PHP_RSHUTDOWN_FUNCTION(module) int PHP_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) -#define PHP_MINFO_FUNCTION(module) void PHP_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS) /* global variables */ extern pval *data; Index: php4/main/php3_compat.h diff -u php4/main/php3_compat.h:1.13 php4/main/php3_compat.h:1.14 --- php4/main/php3_compat.h:1.13 Thu Aug 10 15:38:29 2000 +++ php4/main/php3_compat.h Fri Aug 10 08:48:06 2001 @@ -99,4 +99,26 @@ #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_MINIT(module) +#define PHP_MSHUTDOWN(module) ZEND_MSHUTDOWN(module) +#define PHP_RINIT(module) ZEND_RINIT(module) +#define PHP_RSHUTDOWN(module) ZEND_RSHUTDOWN(module) +#define PHP_MINFO(module) ZEND_MINFO(module) + +#define PHP_MINIT_FUNCTION(module) ZEND_MINIT_FUNCTION(module) +#define PHP_MSHUTDOWN_FUNCTION(module) ZEND_MSHUTDOWN_FUNCTION(module) +#define PHP_RINIT_FUNCTION(module) ZEND_RINIT_FUNCTION(module) +#define PHP_RSHUTDOWN_FUNCTION(module) ZEND_RSHUTDOWN_FUNCTION(module) +#define PHP_MINFO_FUNCTION(module) ZEND_MINFO_FUNCTION(module) + #endif /* PHP3_COMPAT_H */