Reinamed variables to avoid name conflicts

diff --git a/Zend/zend.h b/Zend/zend.h
index d89933c4113e816c771b5d2345c3a6833d11fedf..6a626b83ca79fb10bb2ab2a6d5b139c9b7b8e6c1 100644 (file)
--- 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