From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 14 Sep 2006 10:32:45 +0000 (+0000)
Subject: Reinamed variables to avoid name conflicts
X-Git-Tag: php-5.2.0RC4~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=806bc4e164da39fc54ea3680380e978e976fe24a;p=php

Reinamed variables to avoid name conflicts
---

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