From a6d9b5ed184bf7ef5b7af5127e0079280bea3d82 Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Fri, 16 Jun 2000 02:48:35 +0000
Subject: [PATCH] Macro it up the right way

---
 Zend/zend_execute.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 831e17807cd..8fff13acb90 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -66,9 +66,13 @@ static void zend_extension_fcall_begin_handler(zend_extension *extension, zend_o
 static void zend_extension_fcall_end_handler(zend_extension *extension, zend_op_array *op_array);
 
 #ifdef ZEND_WIN32
-#define ZEND_CHECK_TIMEOUT()													\
-		while (PeekMessage(&timeout_message, EG(timeout_window), 0, 0, PM_REMOVE)) {	\
-			DispatchMessage(&timeout_message);											\
+#define ZEND_CHECK_TIMEOUT()																\
+		{																					\
+			MSG timeout_message;															\
+																							\
+			while (PeekMessage(&timeout_message, EG(timeout_window), 0, 0, PM_REMOVE)) {	\
+				DispatchMessage(&timeout_message);											\
+			}																				\
 		}
 #else
 #define ZEND_CHECK_TIMEOUT()
@@ -963,9 +967,6 @@ void execute(zend_op_array *op_array ELS_DC)
 	temp_variable Ts[op_array->T];
 #endif
 	zend_bool original_in_execution=EG(in_execution);
-#ifdef ZEND_WIN32
-	MSG timeout_message;
-#endif
 
 	EG(in_execution) = 1;
 #if SUPPORT_INTERACTIVE