# HG changeset patch
# User mikejwre
# Date 1274325376 25200
# Node ID d38f45079fe98792a7381dbb4b64f5b589ec8c58
# Parent  5488b2963a50047aa07367dcd70001a4ac70aab8# Parent  daf617c34be61ebfbf762b8f7c742de35b74300a
Merge

diff -r 5488b2963a50 -r d38f45079fe9 src/share/vm/interpreter/bytecodes.cpp
--- a/src/share/vm/interpreter/bytecodes.cpp	Tue May 18 14:10:01 2010 -0700
+++ b/src/share/vm/interpreter/bytecodes.cpp	Wed May 19 20:16:16 2010 -0700
@@ -26,11 +26,13 @@
 #include "incls/_bytecodes.cpp.incl"
 
 
+#if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER < 1600))
 // Windows AMD64 Compiler Hangs compiling this file
 // unless optimization is off
 #ifdef _M_AMD64
 #pragma optimize ("", off)
 #endif
+#endif
 
 
 bool            Bytecodes::_is_initialized = false;