From debb2376ee4f0876c0e6cb26e2a02d4fec87acdb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 Apr 2016 23:52:17 +0300
Subject: Hide attribute clang::fallthrough in macros.

---
 src/localconsts.h           | 3 +++
 src/resources/mapreader.cpp | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/localconsts.h b/src/localconsts.h
index 4b1616db1..455a0ba3c 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -183,12 +183,15 @@
 #define PRAGMACLANG(str) _Pragma(#str)
 #if CLANG_VERSION >= 30800
 #define PRAGMACLANG6(str) _Pragma(#str)
+#define CLANG_FALLTHROUGH [[clang::fallthrough]];
 #else  // __clang_major__ >= 6
 #define PRAGMACLANG6(str)
+#define CLANG_FALLTHROUGH
 #endif  // __clang_major__ >= 6
 #else  // __clang__
 #define PRAGMACLANG(str)
 #define PRAGMACLANG6(str)
+#define CLANG_FALLTHROUGH
 #endif  // __clang__
 
 #ifdef __GNUC__
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index d60f18d03..e1383329f 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -141,9 +141,7 @@ int inflateMemory(unsigned char *restrict const in,
         {
             case Z_NEED_DICT:
                 ret = Z_DATA_ERROR;
-#ifdef __clang__
-            [[clang::fallthrough]];
-#endif
+            CLANG_FALLTHROUGH
             case Z_DATA_ERROR:
             case Z_MEM_ERROR:
                 (void) inflateEnd(&strm);
-- 
cgit v1.2.3-70-g09d2