diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-30 01:56:43 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-30 01:56:43 +0000 |
| commit | 1c25b8dd532961ecb09932b182457ca0adcf8b57 (patch) | |
| tree | 2996afec821096218156f1d914301ad589edf897 /main | |
| parent | b57703825be0ff40d34ee257ce14c453c4bffb98 (diff) | |
| download | php-git-1c25b8dd532961ecb09932b182457ca0adcf8b57.tar.gz | |
Avoid TSRMLS_FETCH()'s, and clean up a bit of stale extern's and layout on the way
Diffstat (limited to 'main')
| -rw-r--r-- | main/internal_functions_win32.c | 2 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/php.h | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 642f81a6be..11990c0d1a 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -60,7 +60,7 @@ #include "ext/xml/php_xml.h" #include "ext/wddx/php_wddx.h" #include "ext/mysql/php_mysql.h" -#include "ext/mysql/mbstring.h" +#include "ext/mbstring/mbstring.h" /* }}} */ /* {{{ php_builtin_extensions[] diff --git a/main/main.c b/main/main.c index 41ea7053d8..20bf73977f 100644 --- a/main/main.c +++ b/main/main.c @@ -700,7 +700,7 @@ void php_request_shutdown(void *dummy) } zend_end_try(); if (PG(modules_activated)) { - zend_deactivate_modules(); + zend_deactivate_modules(TSRMLS_C); } zend_deactivate(TSRMLS_C); diff --git a/main/php.h b/main/php.h index 910992a0f5..34cdeae6e4 100644 --- a/main/php.h +++ b/main/php.h @@ -221,16 +221,12 @@ char *strerror(int); #define PHP_RINIT(module) php_rinit_##module #define PHP_RSHUTDOWN(module) php_rshutdown_##module #define PHP_MINFO(module) php_info_##module -#define PHP_GINIT(module) php_ginit_##module -#define PHP_GSHUTDOWN(module) php_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) int PHP_GINIT(module)(GINIT_FUNC_ARGS) -#define PHP_GSHUTDOWN_FUNCTION(module) int PHP_GSHUTDOWN(module)(void) /* global variables */ |