diff src/share/vm/oops/methodOop.hpp @ 2243:f77b3ec064b0

Merge
author rottenha
date Mon, 21 Feb 2011 04:49:17 -0800
parents c5a923563727 15d6977f04b0
children dbad0519a1c4 5d8f5a6dced7
line wrap: on
line diff
--- a/src/share/vm/oops/methodOop.hpp	Wed Feb 16 17:26:20 2011 -0800
+++ b/src/share/vm/oops/methodOop.hpp	Mon Feb 21 04:49:17 2011 -0800
@@ -729,8 +729,8 @@
 // Disabling optimization doesn't work for methods in header files
 // so we force it to call through the non-optimized version in the .cpp.
 // It's gross, but it's the only way we can ensure that all callers are
-// fixed.  MSC_VER is defined in build/windows/makefiles/compile.make.
-#if defined(_M_AMD64) && MSC_VER >= 1400
+// fixed.  _MSC_VER is defined by the windows compiler
+#if defined(_M_AMD64) && _MSC_VER >= 1400
   void write_pair(int bci, int line);
 #else
   void write_pair(int bci, int line) { write_pair_inline(bci, line); }