diff options
| author | SVN Migration <svn@php.net> | 2002-09-08 15:38:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2002-09-08 15:38:45 +0000 |
| commit | e94c67742f6f4bf9fe9a381273d1ea6a16db5ec3 (patch) | |
| tree | 7cb16c2c460931bbf4798a79167770dfb48ff643 /Zend/zend.c | |
| parent | 6c22f90b4a3d24a8da83e78f8eef97cba6c05197 (diff) | |
| download | php-git-php-4.3.0dev_zend2_alpha3.tar.gz | |
This commit was manufactured by cvs2svn to create tagphp-4.3.0dev_zend2_alpha3
'php_4_3_0_dev_zend2_alpha3'.
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 1940aea4e4..09cf2294da 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -65,7 +65,7 @@ zend_class_entry global_main_class; HashTable *global_auto_globals_table; #endif -zend_utility_values zend_uv; +ZEND_API zend_utility_values zend_uv; ZEND_API zval zval_used_for_init; /* True global variable */ @@ -208,7 +208,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int ZEND_PUTS("Array\n"); if (++expr->value.ht->nApplyCount>1) { ZEND_PUTS(" *RECURSION*"); - expr->value.ht->nApplyCount=0; + expr->value.ht->nApplyCount--; return; } print_hash(expr->value.ht, indent); @@ -220,7 +220,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int if (++object->properties->nApplyCount>1) { ZEND_PUTS(" *RECURSION*"); - object->properties->nApplyCount=0; + object->properties->nApplyCount--; return; } zend_printf("%s Object\n", object->ce->name); @@ -549,6 +549,7 @@ ZEND_API void _zend_bailout(char *filename, uint lineno) } CG(unclean_shutdown) = 1; CG(in_compilation) = EG(in_execution) = 0; + EG(current_execute_data) = NULL; longjmp(EG(bailout), FAILURE); } END_EXTERN_C() |