From 25eca1c33e240c39e5af4a055c5f00200bf359b4 Mon Sep 17 00:00:00 2001 From: Ralph Giles <giles@mozilla.com> Date: Mon, 15 Jul 2013 16:04:14 -0700 Subject: [PATCH] Conditionalize #pragma warn for MSVC. This warning disable was conditional on _WIN32, which mingw also defines, resulting in a warning about the unknown pragma on gcc. Instead make it depend on something only the Visual Studio compiler defines. --- silk/debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/silk/debug.h b/silk/debug.h index 7e6a357bb..a71f1e764 100644 --- a/silk/debug.h +++ b/silk/debug.h @@ -69,7 +69,9 @@ unsigned long GetHighResolutionTime(void); /* O time in usec*/ #if (defined(_WIN32) || defined(_WINCE)) #include <windows.h> /* timer */ +#if defined(_MSC_VER) #pragma warning( disable : 4996 ) /* stop bitching about strcpy in TIC()*/ +#endif #else /* Linux or Mac*/ #include <sys/time.h> #endif -- GitLab