aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2021-12-12 11:45:58 +0000
committerGraeme Geldenhuys <graemeg@gmail.com>2021-12-12 11:45:58 +0000
commitfce98f5e166d20930d71168b967aab3bb2cab82b (patch)
tree7c9fe23329a3cd5664034d5296ea1a498639e202 /launcher
parent7179e75e70f4157326d6d97f11a947df576d02e6 (diff)
downloadPrismLauncher-fce98f5e166d20930d71168b967aab3bb2cab82b.tar.gz
PrismLauncher-fce98f5e166d20930d71168b967aab3bb2cab82b.tar.bz2
PrismLauncher-fce98f5e166d20930d71168b967aab3bb2cab82b.zip
Fixes compilation error expanding from macro 'major'.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/minecraft/launch/VerifyJavaInstall.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/launcher/minecraft/launch/VerifyJavaInstall.cpp b/launcher/minecraft/launch/VerifyJavaInstall.cpp
index d9f7ecdc..15acf678 100644
--- a/launcher/minecraft/launch/VerifyJavaInstall.cpp
+++ b/launcher/minecraft/launch/VerifyJavaInstall.cpp
@@ -5,6 +5,13 @@
#include <minecraft/PackProfile.h>
#include <minecraft/VersionFilterData.h>
+#ifdef major
+ #undef major
+#endif
+#ifdef minor
+ #undef minor
+#endif
+
void VerifyJavaInstall::executeTask() {
auto m_inst = std::dynamic_pointer_cast<MinecraftInstance>(m_parent->instance());