diff options
| author |   Eric Hameleers <alien@slackware.com> | 2015-10-21 12:08:34 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2015-10-21 12:08:34 +0000 |
| commit | ad4327eb2abb22ed610b4552f58877517ec4eedb (patch) | |
| tree | 2445463b196dc40637bf3ebee63509c4887b8266 /p7zip | |
| parent | 898f6e91076f988956ea1556a00916e170b91deb (diff) | |
| download | asb-ad4327eb2abb22ed610b4552f58877517ec4eedb.tar.gz asb-ad4327eb2abb22ed610b4552f58877517ec4eedb.tar.xz | |
p7zip: rebased p7zip_osversion.patch for p7zip_15.09
Diffstat (limited to 'p7zip')
| -rw-r--r-- | p7zip/build/patches/p7zip_osversion.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/p7zip/build/patches/p7zip_osversion.patch b/p7zip/build/patches/p7zip_osversion.patch index 35e11c82..854dc363 100644 --- a/p7zip/build/patches/p7zip_osversion.patch +++ b/p7zip/build/patches/p7zip_osversion.patch @@ -1,15 +1,15 @@ # Taken from http://data.gpo.zugaina.org/gentoo/app-arch/p7zip +# and adapted for p7zip 15.09 -diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp ---- old/CPP/7zip/UI/FileManager/FM.cpp 2015-01-18 08:59:09.000000000 -1000 -+++ new/CPP/7zip/UI/FileManager/FM.cpp 2015-02-09 11:39:55.575712452 -1000 -@@ -348,24 +348,7 @@ +--- p7zip_15.09.orig/CPP/7zip/UI/FileManager/FM.cpp 2015-09-19 20:33:44.000000000 +0200 ++++ p7zip_15.09/CPP/7zip/UI/FileManager/FM.cpp 2015-10-21 14:06:28.128721480 +0200 +@@ -354,26 +354,7 @@ bool IsLargePageSupported() { - #ifdef _WIN64 return true; -- #else +- #elif defined(_WIN32) - OSVERSIONINFO versionInfo; - versionInfo.dwOSVersionInfoSize = sizeof(versionInfo); - if (!::GetVersionEx(&versionInfo)) @@ -24,7 +24,9 @@ diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp - return true; - // return IsWow64(); - return false; +- #else +- return false; - #endif } - #if 0 //#ifndef UNDER_CE + #if 0 // ifndef UNDER_CE |