Mercurial > hg > truffle

diff src/share/vm/code/compressedStream.cpp @ 8721:47bc9800972c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8006498: #if <symbol> is wrong in the code. Summary: ASSERT and other symbols used incorrectly with #if are supposed to be defined or not. Reviewed-by: dholmes, mikael
author jprovino
date Wed, 06 Mar 2013 13:46:55 -0500
parents 5fa559508216
children de6a9e811145
line wrap: on
line diff
--- a/src/share/vm/code/compressedStream.cpp	Wed Mar 06 13:38:17 2013 -0500
+++ b/src/share/vm/code/compressedStream.cpp	Wed Mar 06 13:46:55 2013 -0500
@@ -195,7 +195,7 @@
 // for this block (a matching directive turns it back on later).
 // These directives can be removed once the MS VS.NET 2005
 // compiler stack overflow is fixed.
-#if _MSC_VER >=1400 && !defined(_WIN64)
+#if defined(_MSC_VER) && _MSC_VER >=1400 && !defined(_WIN64)
 #pragma optimize("", off)
 #pragma warning(disable: 4748)
 #endif
@@ -276,7 +276,7 @@
   guarantee(fails == 0, "test failures");
 }
 
-#if _MSC_VER >=1400 && !defined(_WIN64)
+#if defined(_MSC_VER) &&_MSC_VER >=1400 && !defined(_WIN64)
 #pragma warning(default: 4748)
 #pragma optimize("", on)
 #endif