From dc05a6516e124994acb3203bddf92d42db84658b Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Wed, 23 Sep 2015 10:25:41 +0200
Subject: [PATCH] Buildfixes

---
 UI/NativeApp.cpp               | 6 +++---
 ext/native/ext/libzip/zipint.h | 5 +++++
 ext/native/file/file_util.cpp  | 9 ---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 5ca1397d98..09a0ee6f70 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -339,9 +339,9 @@ void NativeInit(int argc, const char *argv[],
 	// On Android, create a PSP directory tree in the external_directory,
 	// to hopefully reduce confusion a bit.
 	ILOG("Creating %s", (g_Config.memStickDirectory + "PSP").c_str());
-	mkDir((g_Config.memStickDirectory + "PSP").c_str());
-	mkDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
-	mkDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
+	File::CreateDir((g_Config.memStickDirectory + "PSP").c_str());
+	File::CreateDir((g_Config.memStickDirectory + "PSP/SAVEDATA").c_str());
+	File::CreateDir((g_Config.memStickDirectory + "PSP/GAME").c_str());
 #endif
 
 	const char *fileToLog = 0;
diff --git a/ext/native/ext/libzip/zipint.h b/ext/native/ext/libzip/zipint.h
index 26e9b73280..46c7335fee 100644
--- a/ext/native/ext/libzip/zipint.h
+++ b/ext/native/ext/libzip/zipint.h
@@ -36,6 +36,11 @@
 
 #include <zlib.h>
 
+// Symbian is nuts
+#if !defined(_WIN32) && defined(UNICODE)
+#undef UNICODE
+#endif
+
 #ifdef _MSC_VER
 #define ZIP_EXTERN
 #define fseeko fseek
diff --git a/ext/native/file/file_util.cpp b/ext/native/file/file_util.cpp
index 41124e6fde..dbfc6b85b6 100644
--- a/ext/native/file/file_util.cpp
+++ b/ext/native/file/file_util.cpp
@@ -144,12 +144,6 @@ bool readDataFromFile(bool text_file, unsigned char* &data, const unsigned int s
 	return true;
 }
 
-
-#define DIR_SEP "/"
-#define DIR_SEP_CHR '\\'
-
-#ifndef METRO
-
 // Returns true if filename is a directory
 bool isDirectory(const std::string &filename) {
 	FileInfo info;
@@ -177,7 +171,6 @@ bool getFileInfo(const char *path, FileInfo *fileInfo) {
 	struct stat64 file_info;
 
 	std::string copy(path);
-	stripTailDirSlashes(copy);
 
 	int result = stat64(copy.c_str(), &file_info);
 
@@ -316,8 +309,6 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
 	return foundEntries;
 }
 
-#endif
-
 std::string getDir(const std::string &path)
 {
 	if (path == "/")