From 62f5c828827674d7b32ac6dbe8758c8c00564420 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Mon, 25 May 2009 04:29:09 +0000 Subject: [PATCH] Removed VS warning. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3542 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/utils/translation.cpp | 7 +++++++ src/utils/translation.hpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/utils/translation.cpp b/src/utils/translation.cpp index 1e09bcfd7..92a71bc69 100644 --- a/src/utils/translation.cpp +++ b/src/utils/translation.cpp @@ -18,6 +18,13 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Note: the irrlicht include is only here (and esp. before including +// translation.hpp, which contradicts our style rule) to avoid the +// warning message " 'swprintf' : macro redefinition" +// This happens if libintl.h is included before irrlicht.h (since +// both files redefine swprintf). +#include "irrlicht.h" + #include "utils/translation.hpp" #include "io/file_manager.hpp" diff --git a/src/utils/translation.hpp b/src/utils/translation.hpp index 95f1706b3..09bc76998 100644 --- a/src/utils/translation.hpp +++ b/src/utils/translation.hpp @@ -17,8 +17,8 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#ifndef TRANSLATION_H -#define TRANSLATION_H +#ifndef TRANSLATION_HPP +#define TRANSLATION_HPP #if ENABLE_NLS # include