cvs: /php4/ext/pcre php_pcre.c php_pcre.h

andrey Fri Sep 3 15:01:19 1999 EDT Modified files: /php4/ext/pcre php_pcre.c php_pcre.h Log: Practice what you preach, I guess. Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.15 php4/ext/pcre/php_pcre.c:1.16 --- php4/ext/pcre/php_pcre.c:1.15 Thu Aug 26 10:13:14 1999 +++ php4/ext/pcre/php_pcre.c Fri Sep 3 15:01:19 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.15 1999/08/26 14:13:14 rasmus Exp $ */ +/* $Id: php_pcre.c,v 1.16 1999/09/03 19:01:19 andrey Exp $ */ #include "php.h" #include "php_globals.h" @@ -46,9 +46,9 @@ }; zend_module_entry pcre_module_entry = { - "PCRE", pcre_functions, php_minit_pcre, php_mshutdown_pcre, - php_rinit_pcre, NULL, - php_info_pcre, STANDARD_MODULE_PROPERTIES + "PCRE", pcre_functions, PHP_MINIT(pcre), PHP_MSHUTDOWN(pcre), + PHP_RINIT(pcre), NULL, + PHP_MINFO(pcre), STANDARD_MODULE_PROPERTIES }; /* }}} */ @@ -98,8 +98,8 @@ #endif -/* {{{ void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS) */ -void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS) +/* {{{ PHP_MINFO_FUNCTION(pcre) */ +PHP_MINFO_FUNCTION(pcre) { php_printf("Perl Compatible Regular Expressions"); php_printf("<table cellpadding=5>" @@ -110,8 +110,8 @@ /* }}} */ -/* {{{ int php_minit_pcre(INIT_FUNC_ARGS) */ -int php_minit_pcre(INIT_FUNC_ARGS) +/* {{{ PHP_MINIT_FUNCTION(pcre) */ +PHP_MINIT_FUNCTION(pcre) { ELS_FETCH(); @@ -131,8 +131,8 @@ /* }}} */ -/* {{{ int php_mshutdown_pcre(void) */ -int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS) +/* {{{ PHP_MSHUTDOWN_FUNCTION(pcre) */ +PHP_MSHUTDOWN_FUNCTION(pcre) { #ifndef ZTS zend_hash_destroy(&PCRE_G(pcre_cache)); @@ -144,8 +144,8 @@ /* }}} */ -/* {{{ int php_rinit_pcre(INIT_FUNC_ARGS) */ -int php_rinit_pcre(INIT_FUNC_ARGS) +/* {{{ PHP_RINIT_FUNCTION(pcre) */ +PHP_RINIT_FUNCTION(pcre) { pcre_malloc = php_pcre_malloc; pcre_free = php_pcre_free; Index: php4/ext/pcre/php_pcre.h diff -u php4/ext/pcre/php_pcre.h:1.11 php4/ext/pcre/php_pcre.h:1.12 --- php4/ext/pcre/php_pcre.h:1.11 Tue Jul 20 16:57:04 1999 +++ php4/ext/pcre/php_pcre.h Fri Sep 3 15:01:19 1999 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.h,v 1.11 1999/07/20 20:57:04 andrey Exp $ */ +/* $Id: php_pcre.h,v 1.12 1999/09/03 19:01:19 andrey Exp $ */ #ifndef _PHP_PCRE_H #define _PHP_PCRE_H @@ -39,10 +39,10 @@ #include <locale.h> #endif -extern void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS); -extern int php_minit_pcre(INIT_FUNC_ARGS); -extern int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS); -extern int php_rinit_pcre(INIT_FUNC_ARGS); +PHP_MINFO_FUNCTION(pcre); +PHP_MINIT_FUNCTION(pcre); +PHP_MSHUTDOWN_FUNCTION(pcre); +PHP_RINIT_FUNCTION(pcre); PHP_FUNCTION(preg_match); PHP_FUNCTION(preg_match_all);