]> granicus.if.org Git - php/commitdiff
make non-ZTS happy again
authorThies C. Arntzen <thies@php.net>
Wed, 8 Dec 1999 14:18:28 +0000 (14:18 +0000)
committerThies C. Arntzen <thies@php.net>
Wed, 8 Dec 1999 14:18:28 +0000 (14:18 +0000)
ext/standard/assert.c

index f17a7220830111ff8f9d27416fa5860907842a9a..08cb61db9fa1b77616cf0c6d045931f184f77b9f 100644 (file)
@@ -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;