diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-23 00:47:57 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-23 00:47:57 -0500 |
| commit | bab91494d53f15d804834ba5d11730b0e855ebd8 (patch) | |
| tree | a86cd67ea34aa3497955dceb501794275e4e7f04 /Source/Core/VideoCommon/Src/x64TextureDecoder.cpp | |
| parent | d84312c799816e8835e6bed562f216bf19725761 (diff) | |
| parent | 1da6469c62fa1b4fd669a48cb583e161d5cb2713 (diff) | |
Merge branch 'master' into android-core-control
Diffstat (limited to 'Source/Core/VideoCommon/Src/x64TextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/x64TextureDecoder.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp index e12b62d5a7..4c26509878 100644 --- a/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/x64TextureDecoder.cpp @@ -28,6 +28,12 @@ #include <tmmintrin.h> #endif +// This avoids a harmless warning from a system header in Clang; +// see http://llvm.org/bugs/show_bug.cgi?id=16093 +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wshadow" +#endif + bool TexFmt_Overlay_Enable=false; bool TexFmt_Overlay_Center=false; |