diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-03 17:46:39 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-03 17:46:39 +0000 |
| commit | 5b293ecd4dcd22a391784a88cead34d810e7eac7 (patch) | |
| tree | 368e68e3f30932d16012778b301c2c78fbf5e46a /main/php.h | |
| parent | 690575e51f1866e00074411aae18f98d76cfdf26 (diff) | |
| download | php-git-5b293ecd4dcd22a391784a88cead34d810e7eac7.tar.gz | |
- add global startup/shutdown handlers
- improve genif.sh to also consider all header files for inclusion
(checks for phpext_)
- use vsnprintf in main.c to avoid buffer overflows
- improve sessions's mm module to cope better with OOM situations
within the shared memory segment
- fix typo wrt session.auto_start
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/main/php.h b/main/php.h index 49966d2a9c..99746fb11f 100644 --- a/main/php.h +++ b/main/php.h @@ -259,12 +259,16 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list); #define PHP_RINIT(module) php3_rinit_##module #define PHP_RSHUTDOWN(module) php3_rshutdown_##module #define PHP_MINFO(module) php3_info_##module - -#define PHP_MINIT_FUNCTION(module) int php3_minit_##module(INIT_FUNC_ARGS) -#define PHP_MSHUTDOWN_FUNCTION(module) int php3_mshutdown_##module(SHUTDOWN_FUNC_ARGS) -#define PHP_RINIT_FUNCTION(module) int php3_rinit_##module(INIT_FUNC_ARGS) -#define PHP_RSHUTDOWN_FUNCTION(module) int php3_rshutdown_##module(SHUTDOWN_FUNC_ARGS) -#define PHP_MINFO_FUNCTION(module) void php3_info_##module(ZEND_MODULE_INFO_FUNC_ARGS) +#define PHP_GINIT(module) php3_ginit_##module +#define PHP_GSHUTDOWN(module) php3_gshutdown_##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) +#define PHP_GINIT_FUNCTION(module) static int PHP_GINIT(module)(void) +#define PHP_GSHUTDOWN_FUNCTION(module) static int PHP_GSHUTDOWN(module)(void) /* global variables */ |