More symbol work.

I've defined a few macros to help with module/request init/startup function definitions.
Basically:

PHP_MINIT_FUNCTION(module)
PHP_MSHUTDOWN_FUNCTION(module)
PHP_RINIT_FUNCTION(module)
PHP_RSHUTDOWN_FUNCTION(module)
PHP_MINFO_FUNCTION(module)

These will expand to proper function prototypes.

Now to specify these in the module entry, use:

PHP_MINIT(module)
PHP_MSHUTDOWN(module)
PHP_RINIT(module)
PHP_RSHUTDOWN(module)
PHP_MINFO(module)

I've updated all modules in ext/standard and everything from ext/apache to ext/db.
If you can, please update your module to use these macros.

1 files changed, 8 insertions, 8 deletions

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index b07657d0c1..f36bd4056a 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -39,15 +39,15 @@ function_entry reg_functions[] = {
 };
 
 
-static int php_minit_regex(INIT_FUNC_ARGS);
-static int php_mshutdown_regex(SHUTDOWN_FUNC_ARGS);
-static void php_info_regex(ZEND_MODULE_INFO_FUNC_ARGS);
+static PHP_MINIT_FUNCTION(regex);
+static PHP_MSHUTDOWN_FUNCTION(regex);
+static PHP_MINFO_FUNCTION(regex);
 
 zend_module_entry regexp_module_entry = {
 	"Regular Expressions", 
 	reg_functions, 
-	php_minit_regex, php_mshutdown_regex,
-	NULL, NULL, php_info_regex, 
+	PHP_MINIT(regex), PHP_MSHUTDOWN(regex),
+	NULL, NULL, PHP_MINFO(regex), 
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -101,7 +101,7 @@ static void php_reg_init_globals(php_reg_globals *reg_globals)
 	_php3_hash_init(&reg_globals->ht_rc, 0, NULL, (int (*)(void *)) _free_reg_cache, 1);
 }
 
-static int php_minit_regex(INIT_FUNC_ARGS)
+static PHP_MINIT_FUNCTION(regex)
 {
 #ifdef ZTS
 	reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), php_reg_init_globals, NULL);
@@ -112,7 +112,7 @@ static int php_minit_regex(INIT_FUNC_ARGS)
 	return SUCCESS;
 }
 
-static int php_mshutdown_regex(SHUTDOWN_FUNC_ARGS)
+static PHP_MSHUTDOWN_FUNCTION(regex)
 {
 	REGLS_FETCH();
 
@@ -120,7 +120,7 @@ static int php_mshutdown_regex(SHUTDOWN_FUNC_ARGS)
 	return SUCCESS;
 }
 
-static void php_info_regex(ZEND_MODULE_INFO_FUNC_ARGS)
+static PHP_MINFO_FUNCTION(regex)
 {
 #if HSREGEX
 	PUTS("Bundled regex library enabled\n");