diff options
| author | swirl <roachh@protonmail.com> | 2021-12-31 14:27:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-31 14:27:21 -0500 |
| commit | 541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa (patch) | |
| tree | 5a300af57c0207d38980319d54dc04218828aa1e /launcher/minecraft/launch/ExtractNatives.cpp | |
| parent | 0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff) | |
| parent | fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (diff) | |
| download | PrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.tar.gz PrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.tar.bz2 PrismLauncher-541e2f0d8d56b1e808ac98b6cf5b3600f324f2fa.zip | |
Merge pull request #8 from dada513/upstream_update
Diffstat (limited to 'launcher/minecraft/launch/ExtractNatives.cpp')
| -rw-r--r-- | launcher/minecraft/launch/ExtractNatives.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index d57499aa..8cd439b1 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -23,6 +23,13 @@ #include "FileSystem.h" #include <QDir> +#ifdef major + #undef major +#endif +#ifdef minor + #undef minor +#endif + static QString replaceSuffix (QString target, const QString &suffix, const QString &replacement) { if (!target.endsWith(suffix)) |