diff options
| author | Andrey Hristov <andrey@php.net> | 1999-07-26 20:09:08 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 1999-07-26 20:09:08 +0000 |
| commit | 1b2c932cc2848da25b38a4e73aa74541a9761beb (patch) | |
| tree | 19c46f9a829a34237c2411cdce3a3c4ca2f4fde1 /ext/apache/apache.c | |
| parent | 7af5579e3f40ccda2e5b5bf47ff3b2a71327317f (diff) | |
| download | php-git-1b2c932cc2848da25b38a4e73aa74541a9761beb.tar.gz | |
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.
Diffstat (limited to 'ext/apache/apache.c')
| -rw-r--r-- | ext/apache/apache.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ext/apache/apache.c b/ext/apache/apache.c index 6b35ae52fe..18a742ddb7 100644 --- a/ext/apache/apache.c +++ b/ext/apache/apache.c @@ -46,15 +46,16 @@ extern module *top_module; PHP_FUNCTION(virtual); PHP_FUNCTION(getallheaders); PHP_FUNCTION(apachelog); -void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS); PHP_FUNCTION(apache_note); PHP_FUNCTION(apache_lookup_uri); +PHP_MINFO_FUNCTION(apache); + function_entry apache_functions[] = { - {"virtual", php3_virtual, NULL}, - {"getallheaders", php3_getallheaders, NULL}, - {"apache_note", php3_apache_note,NULL}, - {"apache_lookup_uri", php3_apache_lookup_uri,NULL}, + PHP_FE(virtual, NULL) + PHP_FE(getallheaders, NULL) + PHP_FE(apache_note, NULL) + PHP_FE(apache_lookup_uri, NULL) {NULL, NULL, NULL} }; @@ -98,14 +99,14 @@ PHP_INI_BEGIN() PHP_INI_END() -static int php_apache_minit(INIT_FUNC_ARGS) +static PHP_MINIT_FUNCTION(apache) { REGISTER_INI_ENTRIES(); return SUCCESS; } -static int php_apache_mshutdown(SHUTDOWN_FUNC_ARGS) +static PHP_MSHUTDOWN_FUNCTION(apache) { UNREGISTER_INI_ENTRIES(); return SUCCESS; @@ -113,7 +114,7 @@ static int php_apache_mshutdown(SHUTDOWN_FUNC_ARGS) php3_module_entry apache_module_entry = { - "Apache", apache_functions, php_apache_minit, php_apache_mshutdown, NULL, NULL, php3_info_apache, STANDARD_MODULE_PROPERTIES + "Apache", apache_functions, PHP_MINIT(apache), PHP_MSHUTDOWN(apache), NULL, NULL, PHP_MINFO(apache), STANDARD_MODULE_PROPERTIES }; /* {{{ proto string apache_note(string note_name [, string note_value]) @@ -146,7 +147,7 @@ PHP_FUNCTION(apache_note) } /* }}} */ -void php3_info_apache(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(apache) { module *modp = NULL; char output_buf[128]; |