diff options
| author | Thies C. Arntzen <thies@php.net> | 1999-12-08 11:47:50 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 1999-12-08 11:47:50 +0000 |
| commit | 5fad6deb652d8d56ecff421d806f53b9b7152ae6 (patch) | |
| tree | ce1d783761698ddded9d81180049ab490b4807bb | |
| parent | 9e2cd01ac57961937d52be18e6a5f53f22ce4194 (diff) | |
| download | php-git-5fad6deb652d8d56ecff421d806f53b9b7152ae6.tar.gz | |
this is the "right" ZTS-fix
| -rw-r--r-- | ext/standard/assert.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 094f832c83..f17a722083 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -88,12 +88,7 @@ PHP_INI_END() static void php_assert_init_globals(php_assert_globals *assert_globals) { - assert_globals->active = 0; - assert_globals->bail = 0; - assert_globals->warning = 1; - assert_globals->quiet_eval = 0; - assert_globals->default_callback = 0; - assert_globals->callback = 0; + ASSERT(callback) = 0; } PHP_MINIT_FUNCTION(assert) @@ -102,6 +97,8 @@ PHP_MINIT_FUNCTION(assert) #ifdef ZTS ELS_FETCH(); assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); +#else + ASSERT(callback) = 0; #endif REGISTER_INI_ENTRIES(); |