From 92f2a16a88b7f6355b908d6e8601241abd31c593 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Wed, 23 Apr 2014 21:12:28 +0000 Subject: [PATCH] Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade This was SVN commit r14975. --- source/scriptinterface/ScriptTypes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/scriptinterface/ScriptTypes.h b/source/scriptinterface/ScriptTypes.h index 2b825ce2d2..2cadcd3d9c 100644 --- a/source/scriptinterface/ScriptTypes.h +++ b/source/scriptinterface/ScriptTypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2014 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -65,6 +65,7 @@ # pragma warning(disable:4512) // "assignment operator could not be generated" # pragma warning(disable:4265) // "class has virtual functions, but destructor is not virtual" # pragma warning(disable:4251) // "class 'X' needs to have dll-interface to be used by clients of struct 'Y'" +# pragma warning(disable:4005) // "macro redefinition" #endif #include "jspubtd.h"