summaryrefslogtreecommitdiff
path: root/src/localconsts.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-27 01:35:52 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-27 01:35:52 +0300
commit035df67c337416a9e35b68ad3a32e80d0718d060 (patch)
treeafe8ddaba6655ad15610cabcedb9154fe393361f /src/localconsts.h
parent23f7d1d7721e212789e9a06e84877cd6465ab593 (diff)
downloadmv-035df67c337416a9e35b68ad3a32e80d0718d060.tar.gz
mv-035df67c337416a9e35b68ad3a32e80d0718d060.tar.bz2
mv-035df67c337416a9e35b68ad3a32e80d0718d060.tar.xz
mv-035df67c337416a9e35b68ad3a32e80d0718d060.zip
Fix compilation with tinyxml2 on old compilers.
Diffstat (limited to 'src/localconsts.h')
-rw-r--r--src/localconsts.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/localconsts.h b/src/localconsts.h
index 6be9d0eaa..61bd0aab9 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -197,12 +197,6 @@
#define const2 const
-#if GCC_VERSION >= 49000
-#define PRAGMA49(str) _Pragma(#str)
-#else // GCC_VERSION > 49000
-#define PRAGMA49(str)
-#endif // GCC_VERSION > 49000
-
#if GCC_VERSION >= 60000
#define PRAGMA6(str) _Pragma(#str)
#else // GCC_VERSION > 60000
@@ -221,6 +215,12 @@
#define A_FALLTHROUGH
#endif // ADVGCC
+#if GCC_VERSION >= 49000
+#define PRAGMA49(str) _Pragma(#str)
+#else // GCC_VERSION > 49000
+#define PRAGMA49(str)
+#endif // GCC_VERSION > 49000
+
#ifdef __clang__
#define PRAGMACLANG(str) _Pragma(#str)
#if CLANG_VERSION >= 30800