From 5adb0b309f8dc53c9105ace32e21b99eb9f678c5 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 14 Sep 2006 10:32:57 +0000 Subject: [PATCH] Reinamed variables to avoid name conflicts --- Zend/zend.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Zend/zend.h b/Zend/zend.h index d89933c411..6a626b83ca 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -493,17 +493,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 -- 2.40.0