summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThies C. Arntzen <thies@php.net>1999-12-08 14:18:28 +0000
committerThies C. Arntzen <thies@php.net>1999-12-08 14:18:28 +0000
commitf7089e600fd6f087987f19acd9c340e945c96650 (patch)
tree32ebc711fac197790b96dc90f3e428f9f37c40ab
parent40340b5aa049c31d775dd5322a485b8b65d6636b (diff)
downloadphp-git-f7089e600fd6f087987f19acd9c340e945c96650.tar.gz
make non-ZTS happy again
-rw-r--r--ext/standard/assert.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index f17a722083..08cb61db9f 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -86,10 +86,12 @@ 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()
+#ifdef ZTS
static void php_assert_init_globals(php_assert_globals *assert_globals)
{
ASSERT(callback) = 0;
}
+#endif
PHP_MINIT_FUNCTION(assert)
{
@@ -174,7 +176,7 @@ PHP_FUNCTION(assert)
if ((*assertion)->type == IS_STRING) {
zval retval;
- int old_error_reporting;
+ int old_error_reporting = 0; /* shut up gcc! */
myeval = (*assertion)->value.str.val;