diff options
author | Ralph Giles <giles@mozilla.com> | 2013-07-16 03:04:14 +0400 |
---|---|---|
committer | Ralph Giles <giles@mozilla.com> | 2013-07-16 03:05:31 +0400 |
commit | 25eca1c33e240c39e5af4a055c5f00200bf359b4 (patch) | |
tree | f2bcc78fdd7f609c5e6814ec5fbad56e0e1e24b9 /silk | |
parent | 5280c71883e4a2d072d6f69ab7c9b6dc7ace66dc (diff) |
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.
Diffstat (limited to 'silk')
-rw-r--r-- | silk/debug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/silk/debug.h b/silk/debug.h index 7e6a357b..a71f1e76 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 |