From 3aa28bd64ad4efc0b9b2d5eaec66a460156895a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 26 Mar 2017 20:40:03 +0200 Subject: NOISSUE fix some warning on linux related to the GNU C library --- api/logic/java/JavaVersion.h | 8 ++++++++ 1 file changed, 8 insertions(+) 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 +// 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; -- cgit v1.2.3