cvs: /php4/ext/standard assert.c
| From: | Thies C. Arntzen | Date: | Wed, 08 Dec 1999 14:18:59 +0000 |
| Subject: | cvs: /php4/ext/standard assert.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7671@lists.php.net to get a copy of this message | ||
thies Wed Dec 8 09:18:59 1999 EDT
Modified files:
/php4/ext/standard assert.c
Log:
make non-ZTS happy again
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.8 php4/ext/standard/assert.c:1.9
--- php4/ext/standard/assert.c:1.8 Wed Dec 8 06:47:50 1999
+++ php4/ext/standard/assert.c Wed Dec 8 09:18:28 1999
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.8 1999/12/08 11:47:50 thies Exp $ */
+/* $Id: assert.c,v 1.9 1999/12/08 14:18:28 thies Exp $ */
/* {{{ includes/startup/misc */
@@ -86,10 +86,12 @@
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 @@
if ((*assertion)->type == IS_STRING) {
zval retval;
- int old_error_reporting;
+ int old_error_reporting = 0; /* shut up gcc! */
myeval = (*assertion)->value.str.val;