From 490de59dddcdacd2d532dfbebe184fa6a12dd1b1 Mon Sep 17 00:00:00 2001 From: David Mandelin Date: Tue, 27 Jul 2010 14:44:25 -0700 Subject: [PATCH] [JAEGER] Fix MSVC warnings. --- js/src/methodjit/Compiler.cpp | 2 +- js/src/methodjit/FastOps.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp index b6df41f092c..de5f60b3148 100644 --- a/js/src/methodjit/Compiler.cpp +++ b/js/src/methodjit/Compiler.cpp @@ -71,7 +71,7 @@ JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse NotCheckedSSE2; #endif -#if defined(JS_CPU_X86) or defined(JS_CPU_X64) +#if defined(JS_CPU_X86) || defined(JS_CPU_X64) static const JSC::MacroAssembler::RegisterID JSReturnReg_Type = JSC::X86Registers::ecx; static const JSC::MacroAssembler::RegisterID JSReturnReg_Data = JSC::X86Registers::edx; #elif defined(JS_CPU_ARM) diff --git a/js/src/methodjit/FastOps.cpp b/js/src/methodjit/FastOps.cpp index d6116857542..89561ff088b 100644 --- a/js/src/methodjit/FastOps.cpp +++ b/js/src/methodjit/FastOps.cpp @@ -1251,7 +1251,7 @@ mjit::Compiler::jsop_stricteq(JSOp op) /* This is only true if the other side is |null|. */ RegisterID result = frame.allocReg(Registers::SingleByteRegs); -#if defined JS_CPU_X86 or defined JS_CPU_ARM +#if defined JS_CPU_X86 || defined JS_CPU_ARM JSValueTag mask = known->getKnownTag(); if (frame.shouldAvoidTypeRemat(test)) masm.set32(cond, masm.tagOf(frame.addressOf(test)), Imm32(mask), result); @@ -1297,7 +1297,7 @@ mjit::Compiler::jsop_stricteq(JSOp op) /* Do a dynamic test. */ bool val = lhsTest ? lhs->getValue().toBoolean() : rhs->getValue().toBoolean(); -#if defined JS_CPU_X86 or defined JS_CPU_ARM +#if defined JS_CPU_X86 || defined JS_CPU_ARM if (frame.shouldAvoidDataRemat(test)) masm.set32(cond, masm.payloadOf(frame.addressOf(test)), Imm32(val), result); else