summaryrefslogtreecommitdiffstats
path: root/src/libs/7zip/win/CPP/Common/Wildcard.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-08-21 12:05:11 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2012-08-24 14:27:53 +0200
commit3e5c51e1f7b99eda252e06968520d212eb5f5fe4 (patch)
treea04e2034316e024f0648a657369772c7f46bb0a8 /src/libs/7zip/win/CPP/Common/Wildcard.cpp
parentf9814b28ce934541f16d12d54534bea543143c01 (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/Common/Wildcard.cpp')
-rw-r--r--src/libs/7zip/win/CPP/Common/Wildcard.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/7zip/win/CPP/Common/Wildcard.cpp b/src/libs/7zip/win/CPP/Common/Wildcard.cpp
index bc4f97bd7..476ddebde 100644
--- a/src/libs/7zip/win/CPP/Common/Wildcard.cpp
+++ b/src/libs/7zip/win/CPP/Common/Wildcard.cpp
@@ -402,12 +402,11 @@ void CCensor::AddItem(bool include, const UString &path, bool recursive)
}
}
int numAbsParts = 0;
- if (isAbs) { // PQR for MinGW-w64: Explicit braces needed.
+ if (isAbs)
if (pathParts.Size() > 1)
numAbsParts = pathParts.Size() - 1;
else
numAbsParts = 1;
- }
UString prefix;
for (int i = 0; i < numAbsParts; i++)
{