summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-03-26 20:40:03 +0200
committerPetr Mrázek <peterix@gmail.com>2017-04-07 00:20:02 +0200
commit3aa28bd64ad4efc0b9b2d5eaec66a460156895a9 (patch)
tree4c8c605201cfa5d7fb5b577af98d73c4f730f630
parentda4ae1bc1ec74cdb4e75f4ebac30886ba4a1909c (diff)
downloadMultiMC-3aa28bd64ad4efc0b9b2d5eaec66a460156895a9.tar
MultiMC-3aa28bd64ad4efc0b9b2d5eaec66a460156895a9.tar.gz
MultiMC-3aa28bd64ad4efc0b9b2d5eaec66a460156895a9.tar.lz
MultiMC-3aa28bd64ad4efc0b9b2d5eaec66a460156895a9.tar.xz
MultiMC-3aa28bd64ad4efc0b9b2d5eaec66a460156895a9.zip
NOISSUE fix some warning on linux related to the GNU C library
-rw-r--r--api/logic/java/JavaVersion.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/api/logic/java/JavaVersion.h b/api/logic/java/JavaVersion.h
index deba5654..de13998c 100644
--- a/api/logic/java/JavaVersion.h
+++ b/api/logic/java/JavaVersion.h
@@ -3,6 +3,14 @@
#include "multimc_logic_export.h"
#include <QString>
+// NOTE: apparently the GNU C library pollutes the global namespace with these... undef them.
+#ifdef major
+ #undef major
+#endif
+#ifdef minor
+ #undef minor
+#endif
+
class MULTIMC_LOGIC_EXPORT JavaVersion
{
friend class JavaVersionTest;