Merge cc4a1bbd67 into 7d1e88413f

unpacktool/CompactProRLEDecompressor.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 #include "IDecompressor.h"
 
 class CompactProRLEDecompressor : public IDecompressor

unpacktool/IDecompressor.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include <stddef.h>
 
 struct CSInputBuffer;
 

unpacktool/IFileReader.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <stddef.h>
 #include <stdint.h>
 
 struct IFileReader

unpacktool/PrefixCode.cpp

@@ -1,3 +1,5 @@
+#include <limits.h>
+
 #include "PrefixCode.h"
 
 struct XADCodeTreeNode

unpacktool/RLE90Decompressor.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <stdint.h>
+
 #include "IDecompressor.h"
 
 class RLE90Decompressor : public IDecompressor

unpacktool/unpacktool.cpp

@@ -1,4 +1,17 @@
 #include <stdio.h>
+#include <string.h>
+
+#include <string>
+#include <vector>
+
+#ifdef _WIN32
+#include <Windows.h>
+#include <shellapi.h>
+
+#include "WindowsUnicodeToolShim.h"
+#else
+#include "UnixCompat.h"
+#endif
 
 #include "IArchiveParser.h"
 #include "IFileReader.h"
@@ -22,18 +35,8 @@
 #include "CompactProLZHRLEDecompressor.h"
 
 #include "CSInputBuffer.h"
-#include "WindowsUnicodeToolShim.h"
-
 #include "CombinedTimestamp.h"
 
-#include <string.h>
-
-#include <Windows.h>
-#include <shellapi.h>
-
-#include <string>
-#include <vector>
-
 class CFileReader final : public IFileReader
 {
 public:
@@ -387,7 +390,7 @@ int ExtractItem(int depth, const ArchiveItem &item, const std::string &dirPath,
 	{
 		mkdir_utf8(path.c_str());
 
-		path.append("\\");
+		path.append("/");
 
 		int returnCode = RecursiveExtractFiles(depth + 1, item.m_children, path, pathParanoid, reader, ts);
 		if (returnCode)