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/assert.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/assert.c')
| -rw-r--r-- | ext/standard/assert.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 8b1a9c3aa6..1fc1684011 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -86,7 +86,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateInt, quiet_eval, php_assert_globals, assert_globals) PHP_INI_END() -static void php_assert_init_globals(ASSERTLS_D) +static void php_assert_init_globals(ASSERTLS_D TSRMLS_DC) { ASSERT(callback) = NULL; } @@ -95,9 +95,9 @@ PHP_MINIT_FUNCTION(assert) { #ifdef ZTS - assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); + ts_allocate_id(&assert_globals_id, sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); #else - php_assert_init_globals(ASSERTLS_C); + php_assert_init_globals(ASSERTLS_C TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); @@ -173,7 +173,7 @@ PHP_FUNCTION(assert) } compiled_string_description = zend_make_compiled_string_description("assert code"); - if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) { + if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC TSRMLS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval); /* zend_error() does not return in this case. */ @@ -199,8 +199,8 @@ PHP_FUNCTION(assert) zval *args[4]; zval *retval; int i; - uint lineno = zend_get_executed_lineno(ELS_C); - char *filename = zend_get_executed_filename(ELS_C); + uint lineno = zend_get_executed_lineno(TSRMLS_C); + char *filename = zend_get_executed_filename(TSRMLS_C); MAKE_STD_ZVAL(args[0]); MAKE_STD_ZVAL(args[1]); |