cvs: /php4/ext/standard assert.c

thies Wed Dec 8 06:48:21 1999 EDT Modified files: /php4/ext/standard assert.c Log: this is the "right" ZTS-fix Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.7 php4/ext/standard/assert.c:1.8 --- php4/ext/standard/assert.c:1.7 Tue Dec 7 16:07:42 1999 +++ php4/ext/standard/assert.c Wed Dec 8 06:47:50 1999 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.7 1999/12/07 21:07:42 rubys Exp $ */ +/* $Id: assert.c,v 1.8 1999/12/08 11:47:50 thies Exp $ */ /* {{{ includes/startup/misc */ @@ -88,12 +88,7 @@ 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 @@ #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();