From: Felipe Pena <felipe@php.net>
Date: Mon, 7 Jun 2010 23:04:30 +0000 (+0000)
Subject: - Let's generate this #ifdef only on zend_vm_execute.h
X-Git-Tag: php-5.4.0alpha1~191^2~1334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d97ae936168a24e57f55635b0113717c3bf1adeb;p=php

- Let's generate this #ifdef only on zend_vm_execute.h
---

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c73115aa05..c456c7e8a4 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -18,7 +18,6 @@
    +----------------------------------------------------------------------+
 */
 
-
 #ifdef ZEND_WIN32
 # pragma warning(once : 4101)
 #endif
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 81180ceb53..6ac0f0897d 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -41,10 +41,6 @@ $header_text = <<< DATA
 */
 
 
-#ifdef ZEND_WIN32
-# pragma warning(once : 4101)
-#endif
-
 DATA;
 
 /*
@@ -1206,6 +1202,9 @@ function gen_vm($def, $skel) {
 	// Insert header
 	out($f, $GLOBALS['header_text']);
 
+	// Suppress free_op1 warnings on Windows
+	out($f, "#ifdef ZEND_WIN32\n# pragma warning(once : 4101)\n#endif\n");
+	
 	// Support for ZEND_USER_OPCODE
 	out($f, "static user_opcode_handler_t zend_user_opcode_handlers[256] = {");
 	for ($i = 0; $i < 255; ++$i) {