diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-09-14 10:32:45 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-09-14 10:32:45 +0000 |
| commit | 806bc4e164da39fc54ea3680380e978e976fe24a (patch) | |
| tree | 0d6cd86d0cab423bc398f652f305ad79e401c559 /Zend | |
| parent | 2604f21fa686661c1c037da11f3a38f0d99c221f (diff) | |
| download | php-git-806bc4e164da39fc54ea3680380e978e976fe24a.tar.gz | |
Reinamed variables to avoid name conflicts
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 0ed6da1cbf..a1a1c37266 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -448,17 +448,17 @@ END_EXTERN_C() #define zend_try \ { \ - jmp_buf *orig_bailout = EG(bailout); \ - jmp_buf bailout; \ + jmp_buf *__orig_bailout = EG(bailout); \ + jmp_buf __bailout; \ \ - EG(bailout) = &bailout; \ - if (setjmp(bailout)==0) { + EG(bailout) = &__bailout; \ + if (setjmp(__bailout)==0) { #define zend_catch \ } else { \ - EG(bailout) = orig_bailout; + EG(bailout) = __orig_bailout; #define zend_end_try() \ } \ - EG(bailout) = orig_bailout; \ + EG(bailout) = __orig_bailout; \ } #define zend_first_try EG(bailout)=NULL; zend_try |