Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-23 11:44:54 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-23 11:44:54 +0300
commitd3fa1bd4d5a8ec82ffa41b996d7169711ee5831d (patch)
tree4472deab335b24fa50495daeca8f38be0bd05c9a /source/blender/python/intern/bpy_app_sdl.c
parent073ce98231d5576c8bff2aab012ba341e058c316 (diff)
Fix warnings reported by MSVC
Mainly it's related on a bad practice in SDL to force-define __SSE__ and __SSE2__ flags which generates quite some warnings and causes too much noise. There are some other warnings fixed. Should be no functional changes. NeXyon, please check the changes in audaspace :)
Diffstat (limited to 'source/blender/python/intern/bpy_app_sdl.c')
-rw-r--r--source/blender/python/intern/bpy_app_sdl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_app_sdl.c b/source/blender/python/intern/bpy_app_sdl.c
index c91595b5900..2f4d8e6c325 100644
--- a/source/blender/python/intern/bpy_app_sdl.c
+++ b/source/blender/python/intern/bpy_app_sdl.c
@@ -30,7 +30,18 @@
#include "bpy_app_sdl.h"
#ifdef WITH_SDL
+/* SDL force defines __SSE__ and __SSE2__ flags, which generates warnings
+ * because we pass those defines via command line as well. For until there's
+ * proper ifndef added to SDL headers we ignore the redefinition warning.
+ */
+# ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable : 4005)
+# endif
# include "SDL.h"
+# ifdef _MSC_VER
+# pragma warning(pop)
+# endif
# ifdef WITH_SDL_DYNLOAD
# include "sdlew.h"
# endif