diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-24 14:27:53 +0200 |
| commit | 3e5c51e1f7b99eda252e06968520d212eb5f5fe4 (patch) | |
| tree | a04e2034316e024f0648a657369772c7f46bb0a8 /src/libs/7zip/win/CPP/Windows/FileIO.cpp | |
| parent | f9814b28ce934541f16d12d54534bea543143c01 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."wip/componentview
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/Windows/FileIO.cpp')
| -rw-r--r-- | src/libs/7zip/win/CPP/Windows/FileIO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/7zip/win/CPP/Windows/FileIO.cpp b/src/libs/7zip/win/CPP/Windows/FileIO.cpp index c848a710c..938e6c701 100644 --- a/src/libs/7zip/win/CPP/Windows/FileIO.cpp +++ b/src/libs/7zip/win/CPP/Windows/FileIO.cpp @@ -71,12 +71,12 @@ bool GetLongPathBase(LPCWSTR s, UString &res) res.Empty(); int len = MyStringLen(s); wchar_t c = s[0]; - if (len < 1 || c == L'\\' || (c == L'.' && (len == 1 || (len == 2 && s[1] == L'.')))) // PQR for MinGW-w64: Priority parentheses. + if (len < 1 || c == L'\\' || c == L'.' && (len == 1 || len == 2 && s[1] == L'.')) return true; UString curDir; bool isAbs = false; if (len > 3) - isAbs = (s[1] == L':' && s[2] == L'\\' && ((c >= L'a' && c <= L'z') || (c >= L'A' && c <= L'Z'))); // PQR for MinGW-w64: Priority parentheses. + isAbs = (s[1] == L':' && s[2] == L'\\' && (c >= L'a' && c <= L'z' || c >= L'A' && c <= L'Z')); if (!isAbs) { |