From 6b38fa35b0416bb4e4b5d3eed84399c1db795bb9 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sun, 8 Feb 2015 15:49:25 -0800
Subject: [PATCH] Use _MSC_VER for MSVC-specific pragmas

These aren't used on mingw so they need to be surrounded by #ifdef
_MSC_VER
---
 plugins/obs-outputs/librtmp/rtmp.h                | 2 ++
 plugins/win-capture/d3d8-api/d3d8types.h          | 6 ++++++
 plugins/win-capture/graphics-hook/gl-capture.c    | 4 ++++
 plugins/win-capture/graphics-hook/graphics-hook.h | 2 ++
 plugins/win-capture/obfuscate.c                   | 4 ++++
 plugins/win-dshow/ffmpeg-decode.h                 | 4 ++--
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/plugins/obs-outputs/librtmp/rtmp.h b/plugins/obs-outputs/librtmp/rtmp.h
index adce1a2b6..6d562b4be 100644
--- a/plugins/obs-outputs/librtmp/rtmp.h
+++ b/plugins/obs-outputs/librtmp/rtmp.h
@@ -37,8 +37,10 @@
 #include <stdint.h>
 
 #ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(disable:4996) //depricated warnings
 #pragma warning(disable:4244) //64bit defensive mechanism, fixed the ones that mattered
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
diff --git a/plugins/win-capture/d3d8-api/d3d8types.h b/plugins/win-capture/d3d8-api/d3d8types.h
index 5d622af42..9774619e5 100644
--- a/plugins/win-capture/d3d8-api/d3d8types.h
+++ b/plugins/win-capture/d3d8-api/d3d8types.h
@@ -22,7 +22,11 @@
 #if _MSC_VER >= 1200
 #pragma warning(push)
 #endif
+
+#ifdef _MSC_VER
 #pragma warning(disable:4201) // anonymous unions warning
+#endif
+
 #if defined(_X86_) || defined(_IA64_)
 #pragma pack(4)
 #endif
@@ -1676,8 +1680,10 @@ typedef struct _D3DDEVINFO_D3DVERTEXSTATS
 #if _MSC_VER >= 1200
 #pragma warning(pop)
 #else
+#ifdef _MSC_VER
 #pragma warning(default:4201)
 #endif
+#endif
 
 #endif /* (DIRECT3D_VERSION >= 0x0800) */
 #endif /* _D3D8TYPES(P)_H_ */
diff --git a/plugins/win-capture/graphics-hook/gl-capture.c b/plugins/win-capture/graphics-hook/gl-capture.c
index 724b6baa5..987f9542e 100644
--- a/plugins/win-capture/graphics-hook/gl-capture.c
+++ b/plugins/win-capture/graphics-hook/gl-capture.c
@@ -1,6 +1,10 @@
 #define _CRT_SECURE_NO_WARNINGS
+
+#ifdef _MSC_VER
 #pragma warning(disable : 4214) /* nonstandard extension, non-int bitfield */
 #pragma warning(disable : 4054) /* function pointer to data pointer */
+#endif
+
 #include <windows.h>
 
 #define COBJMACROS
diff --git a/plugins/win-capture/graphics-hook/graphics-hook.h b/plugins/win-capture/graphics-hook/graphics-hook.h
index 355e16ba0..0786e9938 100644
--- a/plugins/win-capture/graphics-hook/graphics-hook.h
+++ b/plugins/win-capture/graphics-hook/graphics-hook.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#ifdef _MSC_VER
 /* conversion from data/function pointer */
 #pragma warning(disable: 4152)
+#endif
 
 #include "../graphics-hook-info.h"
 
diff --git a/plugins/win-capture/obfuscate.c b/plugins/win-capture/obfuscate.c
index 10d6e7794..9317162ca 100644
--- a/plugins/win-capture/obfuscate.c
+++ b/plugins/win-capture/obfuscate.c
@@ -1,5 +1,9 @@
 #define _CRT_SECURE_NO_WARNINGS
+
+#ifdef _MSC_VER
 #pragma warning(disable : 4152) /* casting func ptr to void */
+#endif
+
 #include <stdbool.h>
 #include <windows.h>
 #include "obfuscate.h"
diff --git a/plugins/win-dshow/ffmpeg-decode.h b/plugins/win-dshow/ffmpeg-decode.h
index aaa4cbba1..aca1be52e 100644
--- a/plugins/win-dshow/ffmpeg-decode.h
+++ b/plugins/win-dshow/ffmpeg-decode.h
@@ -23,7 +23,7 @@ extern "C" {
 
 #include <obs.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4204)
@@ -32,7 +32,7 @@ extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavutil/log.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif