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/array.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/array.c')
| -rw-r--r-- | ext/standard/array.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 4dd3b1fe14..199075b70e 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -68,7 +68,7 @@ php_array_globals array_globals; PHP_MINIT_FUNCTION(array) { #ifdef ZTS - array_globals_id = ts_allocate_id(sizeof(php_array_globals), NULL, NULL); + ts_allocate_id(&array_globals_id, sizeof(php_array_globals), NULL, NULL); #endif REGISTER_LONG_CONSTANT("EXTR_OVERWRITE", EXTR_OVERWRITE, CONST_CS | CONST_PERSISTENT); @@ -522,7 +522,7 @@ static int array_user_compare(const void *a, const void *b) Bucket *s; pval **args[2]; pval *retval_ptr; - ELS_FETCH(); + TSRMLS_FETCH(); BLS_FETCH(); f = *((Bucket **) a); @@ -610,7 +610,7 @@ static int array_user_key_compare(const void *a, const void *b) pval *args[2]; pval retval; int status; - ELS_FETCH(); + TSRMLS_FETCH(); BLS_FETCH(); args[0] = &key1; @@ -959,7 +959,7 @@ static int php_array_walk(HashTable *target_hash, zval **userdata) ulong num_key; HashPosition pos; BLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); /* Allocate space for key */ MAKE_STD_ZVAL(key); |