Practice what you preach, I guess.

This commit is contained in:
Andrey Hristov 1999-09-03 19:01:19 +00:00
parent 3e591dabbd
commit f72897c29d
2 changed files with 15 additions and 15 deletions

View file

@ -46,9 +46,9 @@ function_entry pcre_functions[] = {
}; };
zend_module_entry pcre_module_entry = { zend_module_entry pcre_module_entry = {
"PCRE", pcre_functions, php_minit_pcre, php_mshutdown_pcre, "PCRE", pcre_functions, PHP_MINIT(pcre), PHP_MSHUTDOWN(pcre),
php_rinit_pcre, NULL, PHP_RINIT(pcre), NULL,
php_info_pcre, STANDARD_MODULE_PROPERTIES PHP_MINFO(pcre), STANDARD_MODULE_PROPERTIES
}; };
/* }}} */ /* }}} */
@ -98,8 +98,8 @@ static void _php_pcre_shutdown_globals(php_pcre_globals *pcre_globals)
#endif #endif
/* {{{ void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS) */ /* {{{ PHP_MINFO_FUNCTION(pcre) */
void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS) PHP_MINFO_FUNCTION(pcre)
{ {
php_printf("Perl Compatible Regular Expressions"); php_printf("Perl Compatible Regular Expressions");
php_printf("<table cellpadding=5>" php_printf("<table cellpadding=5>"
@ -110,8 +110,8 @@ void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS)
/* }}} */ /* }}} */
/* {{{ int php_minit_pcre(INIT_FUNC_ARGS) */ /* {{{ PHP_MINIT_FUNCTION(pcre) */
int php_minit_pcre(INIT_FUNC_ARGS) PHP_MINIT_FUNCTION(pcre)
{ {
ELS_FETCH(); ELS_FETCH();
@ -131,8 +131,8 @@ int php_minit_pcre(INIT_FUNC_ARGS)
/* }}} */ /* }}} */
/* {{{ int php_mshutdown_pcre(void) */ /* {{{ PHP_MSHUTDOWN_FUNCTION(pcre) */
int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS) PHP_MSHUTDOWN_FUNCTION(pcre)
{ {
#ifndef ZTS #ifndef ZTS
zend_hash_destroy(&PCRE_G(pcre_cache)); zend_hash_destroy(&PCRE_G(pcre_cache));
@ -144,8 +144,8 @@ int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS)
/* }}} */ /* }}} */
/* {{{ int php_rinit_pcre(INIT_FUNC_ARGS) */ /* {{{ PHP_RINIT_FUNCTION(pcre) */
int php_rinit_pcre(INIT_FUNC_ARGS) PHP_RINIT_FUNCTION(pcre)
{ {
pcre_malloc = php_pcre_malloc; pcre_malloc = php_pcre_malloc;
pcre_free = php_pcre_free; pcre_free = php_pcre_free;

View file

@ -39,10 +39,10 @@
#include <locale.h> #include <locale.h>
#endif #endif
extern void php_info_pcre(ZEND_MODULE_INFO_FUNC_ARGS); PHP_MINFO_FUNCTION(pcre);
extern int php_minit_pcre(INIT_FUNC_ARGS); PHP_MINIT_FUNCTION(pcre);
extern int php_mshutdown_pcre(SHUTDOWN_FUNC_ARGS); PHP_MSHUTDOWN_FUNCTION(pcre);
extern int php_rinit_pcre(INIT_FUNC_ARGS); PHP_RINIT_FUNCTION(pcre);
PHP_FUNCTION(preg_match); PHP_FUNCTION(preg_match);
PHP_FUNCTION(preg_match_all); PHP_FUNCTION(preg_match_all);