Browse Source

Reinamed variables to avoid name conflicts

migration/RELEASE_1_0_0
Dmitry Stogov 20 years ago
parent
commit
5adb0b309f
  1. 12
      Zend/zend.h

12
Zend/zend.h

@ -493,17 +493,17 @@ END_EXTERN_C()
#define zend_try \ #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 \ #define zend_catch \
} else { \ } else { \
EG(bailout) = orig_bailout;
EG(bailout) = __orig_bailout;
#define zend_end_try() \ #define zend_end_try() \
} \ } \
EG(bailout) = orig_bailout; \
EG(bailout) = __orig_bailout; \
} }
#define zend_first_try EG(bailout)=NULL; zend_try #define zend_first_try EG(bailout)=NULL; zend_try

Loading…
Cancel
Save