- 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 c73115aa051064f3606367acc74f5c05def5f704..c456c7e8a4c531f77fdc4c15bd59b85c0bc8811a 100644 (file)
--- 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 81180ceb533dbd60bbf250ae72d831431240eb22..6ac0f0897d2e1afb400070ca73cbd4def5010efc 100644 (file)
--- 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) {