aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSupSuper2019-05-09 03:07:07 +0100
committerPaul Gilbert2019-05-09 18:13:10 +1000
commit276f6e0bfd5a40ab6e06a5af03f5ab53b78b3f9c (patch)
treea08b5d995da1bba00a537d79723aee03d9ef1151
parent8d17b6c48a91e7f12a707712c9e85d7c3bee9637 (diff)
downloadscummvm-rg350-276f6e0bfd5a40ab6e06a5af03f5ab53b78b3f9c.tar.gz
scummvm-rg350-276f6e0bfd5a40ab6e06a5af03f5ab53b78b3f9c.tar.bz2
scummvm-rg350-276f6e0bfd5a40ab6e06a5af03f5ab53b78b3f9c.zip
SDL: Fix MSVC warnings
Fixes warning C4121: alignment of a member was sensitive to packing by hiding warnings from system headers
-rw-r--r--backends/platform/sdl/sdl-sys.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/backends/platform/sdl/sdl-sys.h b/backends/platform/sdl/sdl-sys.h
index 9b87f5eabd..edb57c30f9 100644
--- a/backends/platform/sdl/sdl-sys.h
+++ b/backends/platform/sdl/sdl-sys.h
@@ -144,7 +144,11 @@
#include <SDL.h>
#endif
+// Ignore warnings from system headers pulled by SDL
+#pragma warning(push)
+#pragma warning(disable:4121) // alignment of a member was sensitive to packing
#include <SDL_syswm.h>
+#pragma warning(pop)
// Restore the forbidden exceptions from the hack above
#if !defined(FORBIDDEN_SYMBOL_ALLOW_ALL) && defined(_MSC_VER)