summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/TextureDecoder_x64.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2014-07-13 17:52:54 -0700
committershuffle2 <godisgovernment@gmail.com>2014-07-13 17:52:54 -0700
commit3f67ec0d50f86f964c8839d0148694a240973aab (patch)
tree0f7d38c0b05af6506507ea1a564a74c3a28d405b /Source/Core/VideoCommon/TextureDecoder_x64.cpp
parent5c701f6e82c5ec246dcb6b7a3b4450e347cc37ec (diff)
parentb6f3ae23bcb4c07351114abaab554307d2286e91 (diff)
Merge pull request #611 from Tilka/clang_bug
VideoCommon: version-check clang for workaround
Diffstat (limited to 'Source/Core/VideoCommon/TextureDecoder_x64.cpp')
-rw-r--r--Source/Core/VideoCommon/TextureDecoder_x64.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
index 245e5c6141..10b675a772 100644
--- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -28,7 +28,7 @@
// This avoids a harmless warning from a system header in Clang;
// see http://llvm.org/bugs/show_bug.cgi?id=16093
-#ifdef __clang__
+#ifdef __clang__ && __clang_major__ * 100 + __clang_minor__ <= 304
#pragma clang diagnostic ignored "-Wshadow"
#endif