From 1cbc3259be4a40f1ebc32f7e3562a45c2d145bd9 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 2 Sep 2008 10:28:14 -0700 Subject: [PATCH] Build fixes for MSVC 7.1 and mingw (bug 451881, patch from neil@parkwaycc.co.uk). --- js/src/nanojit/LIR.h | 5 ++++- js/src/nanojit/avmplus.h | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/src/nanojit/LIR.h b/js/src/nanojit/LIR.h index a4fe4d2f5..9fbcc55b8 100644 --- a/js/src/nanojit/LIR.h +++ b/js/src/nanojit/LIR.h @@ -45,7 +45,10 @@ namespace nanojit { #define is_trace_skip_tramp(op) ((op) <= LIR_tramp) - enum LOpcode __msvc_only(: unsigned) + enum LOpcode +#if defined(_MSC_VER) && _MSC_VER >= 1400 + : unsigned +#endif { // flags; upper bits reserved LIR64 = 0x40, // result is double or quad diff --git a/js/src/nanojit/avmplus.h b/js/src/nanojit/avmplus.h index 0197b004a..1bb488b4c 100644 --- a/js/src/nanojit/avmplus.h +++ b/js/src/nanojit/avmplus.h @@ -48,11 +48,8 @@ #define FASTCALL JS_FASTCALL -#ifdef _MSC_VER -#define __msvc_only(x) x +#ifdef WIN32 #include -#else -#define __msvc_only(x) #endif #ifdef DEBUG -- 2.11.4.GIT