Fixes required for errorless MinGW-w64 compilation are done.

Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

4 files changed, 6 insertions, 4 deletions

diff --git a/src/libs/7zip/win/CPP/Common/DynamicBuffer.h b/src/libs/7zip/win/CPP/Common/DynamicBuffer.h
index bf52a7425..8bf54e726 100644
--- a/src/libs/7zip/win/CPP/Common/DynamicBuffer.h
+++ b/src/libs/7zip/win/CPP/Common/DynamicBuffer.h
@@ -20,7 +20,7 @@ template <class T> class CDynamicBuffer: public CBuffer<T>
     size_t newCap = this->_capacity + delta;
     if (newCap < delta)
       newCap = this->_capacity + size;
-    SetCapacity(newCap);
+    CBuffer<T>::SetCapacity(newCap); // PQR for MinGW-w64: template specification required.
   }
 public:
   CDynamicBuffer(): CBuffer<T>() {};
diff --git a/src/libs/7zip/win/CPP/Common/MyCom.h b/src/libs/7zip/win/CPP/Common/MyCom.h
index 2f00c258f..308a35d18 100644
--- a/src/libs/7zip/win/CPP/Common/MyCom.h
+++ b/src/libs/7zip/win/CPP/Common/MyCom.h
@@ -4,6 +4,7 @@
 #define __MYCOM_H
 
 #include "MyWindows.h"
+#include "unknwn.h" // PQR for MinGW-w64: To allow IID_IUnknown to be defined.
 
 #ifndef RINOK
 #define RINOK(x) { HRESULT __result_ = (x); if (__result_ != S_OK) return __result_; }
diff --git a/src/libs/7zip/win/CPP/Common/Wildcard.cpp b/src/libs/7zip/win/CPP/Common/Wildcard.cpp
index 476ddebde..bc4f97bd7 100644
--- a/src/libs/7zip/win/CPP/Common/Wildcard.cpp
+++ b/src/libs/7zip/win/CPP/Common/Wildcard.cpp
@@ -402,11 +402,12 @@ void CCensor::AddItem(bool include, const UString &path, bool recursive)
     }
   }
   int numAbsParts = 0;
-  if (isAbs)
+  if (isAbs) { // PQR for MinGW-w64: Explicit braces needed.
     if (pathParts.Size() > 1)
       numAbsParts = pathParts.Size() - 1;
     else
       numAbsParts = 1;
+  }
   UString prefix;
   for (int i = 0; i < numAbsParts; i++)
   {
diff --git a/src/libs/7zip/win/CPP/Common/Wildcard.h b/src/libs/7zip/win/CPP/Common/Wildcard.h
index 6d4cbcece..859f567ea 100644
--- a/src/libs/7zip/win/CPP/Common/Wildcard.h
+++ b/src/libs/7zip/win/CPP/Common/Wildcard.h
@@ -32,8 +32,8 @@ class CCensorNode
   void AddItemSimple(bool include, CItem &item);
   bool CheckPath(UStringVector &pathParts, bool isFile, bool &include) const;
 public:
-  CCensorNode(): Parent(0) { };
-  CCensorNode(const UString &name, CCensorNode *parent): Name(name), Parent(parent) { };
+  CCensorNode(): Parent(0) { }
+  CCensorNode(const UString &name, CCensorNode *parent): Parent(parent), Name(name) { } // PQR for MinGW-w64: Initialization order.
   UString Name;
   CObjectVector<CCensorNode> SubNodes;
   CObjectVector<CItem> IncludeItems;