From 87e6767033d5233bdba6df0f788a7c6e52ab0e78 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 27 Mar 2020 18:41:18 +0100 Subject: [PATCH] gs-mipmapper: Fix some warnings --- source/obs/gs/gs-mipmapper.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/source/obs/gs/gs-mipmapper.cpp b/source/obs/gs/gs-mipmapper.cpp index 25bcb624..dda61250 100644 --- a/source/obs/gs/gs-mipmapper.cpp +++ b/source/obs/gs/gs-mipmapper.cpp @@ -35,9 +35,14 @@ #endif #if defined(WIN32) || defined(WIN64) -extern "C" { +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable : 5039) +#endif #include -} +#ifdef _MSC_VER +#pragma warning(pop) +#endif #endif // Here be dragons! @@ -50,12 +55,12 @@ struct graphics_subsystem { }; #if defined(WIN32) || defined(WIN64) -#include -#include #ifdef _MSC_VER #pragma warning(push) -#pragma warning(disable : 4201) +#pragma warning(disable : 4201 4365) #endif +#include +#include #include #ifdef _MSC_VER #pragma warning(pop)