changeset 1527:d38f45079fe9 jdk7-b94

Merge
author mikejwre
date Wed, 19 May 2010 20:16:16 -0700
parents 5488b2963a50 daf617c34be6
children b1f1fb382940
files src/share/vm/interpreter/bytecodes.cpp
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;