diff options
| author | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
|---|---|---|
| committer | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
| commit | fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (patch) | |
| tree | 5a300af57c0207d38980319d54dc04218828aa1e /launcher/minecraft/launch/VerifyJavaInstall.cpp | |
| parent | 0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff) | |
| parent | 9579231ccc36d9d32f4d5571ced91e8fe7851643 (diff) | |
| download | PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.gz PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.bz2 PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.zip | |
Merge remote-tracking branch 'upstream/develop' into upstream_update
Diffstat (limited to 'launcher/minecraft/launch/VerifyJavaInstall.cpp')
| -rw-r--r-- | launcher/minecraft/launch/VerifyJavaInstall.cpp | 7 |
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()); |