From a15dab5fb87d105dc35379dc88083f48ed0fee46 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Fri, 1 Aug 2003 05:41:07 +0000 Subject: This should be Microsoft Visual C++ only svn-id: r9355 --- common/stdafx.h | 2 ++ common/str.cpp | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'common') diff --git a/common/stdafx.h b/common/stdafx.h index a2f011393b..706d9f2047 100644 --- a/common/stdafx.h +++ b/common/stdafx.h @@ -35,10 +35,12 @@ #elif defined(WIN32) +#if _MSC_VER #pragma once #pragma warning( disable : 4068 ) // turn off "unknown pragma" warning #pragma warning( disable : 4244 ) // turn off "conversion type" warning #pragma warning( disable : 4390 ) // turn oof "empty statement" warning for BS2 code +#endif #if !defined(_WIN32_WCE) diff --git a/common/str.cpp b/common/str.cpp index 97bb7fb17e..91ba683838 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -23,11 +23,6 @@ #include -#ifdef _MSC_VER -// Disable "unknown pragma" warning in MSVC 6 -#pragma warning(disable : 4068) -#endif - namespace ScummVM { String::String(const char *str, int len) { -- cgit v1.2.3