diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:44:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-23 11:44:54 +0300 |
| commit | d3fa1bd4d5a8ec82ffa41b996d7169711ee5831d (patch) | |
| tree | 4472deab335b24fa50495daeca8f38be0bd05c9a /intern/audaspace | |
| parent | 073ce98231d5576c8bff2aab012ba341e058c316 (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 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/SDL/AUD_SDLDevice.h | 11 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/intern/audaspace/SDL/AUD_SDLDevice.h b/intern/audaspace/SDL/AUD_SDLDevice.h index 266edd0dfcc..c4ff9e80aa9 100644 --- a/intern/audaspace/SDL/AUD_SDLDevice.h +++ b/intern/audaspace/SDL/AUD_SDLDevice.h @@ -32,7 +32,18 @@ #include "AUD_SoftwareDevice.h" +/* 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 /** * This device plays back through SDL, the simple direct media layer. diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index db3d157df72..b326c9f4281 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -75,7 +75,6 @@ #include "AUD_MutexLock.h" #ifdef WITH_SDL -#include <SDL.h> #include "AUD_SDLDevice.h" #endif |