diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-27 10:16:41 +0000 |
| commit | fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 (patch) | |
| tree | c7bc98cac58386828871aae860f90cac0ebdcf8f /ext/standard/reg.c | |
| parent | 2c254ba762d9392a732d5793b5b193ee6e395f1c (diff) | |
| download | php-git-fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5.tar.gz | |
- Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
Diffstat (limited to 'ext/standard/reg.c')
| -rw-r--r-- | ext/standard/reg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/reg.c b/ext/standard/reg.c index bcd0111b8a..c962f2b8c4 100644 --- a/ext/standard/reg.c +++ b/ext/standard/reg.c @@ -84,7 +84,7 @@ static void _free_reg_cache(reg_cache *rc) #undef regcomp #define regcomp(a,b,c) _php_regcomp(a,b,c) -static void php_reg_init_globals(php_reg_globals *reg_globals) +static void php_reg_init_globals(php_reg_globals *reg_globals TSRMLS_DC) { zend_hash_init(®_globals->ht_rc, 0, NULL, (void (*)(void *)) _free_reg_cache, 1); } @@ -92,9 +92,9 @@ static void php_reg_init_globals(php_reg_globals *reg_globals) PHP_MINIT_FUNCTION(regex) { #ifdef ZTS - reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); + ts_allocate_id(®_globals_id, sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); #else - php_reg_init_globals(®_globals); + php_reg_init_globals(®_globals TSRMLS_CC); #endif return SUCCESS; |