From af55d2db773ea1a490025813ef6c553a3e2971f3 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Wed, 14 Dec 2016 22:25:43 -0600
Subject: [PATCH] Fix several warnings and build issues.

---
 src/ox/fs/filesystem.hpp | 2 +-
 src/ox/fs/oxfstool.cpp   | 2 +-
 src/ox/std/types.hpp     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ox/fs/filesystem.hpp b/src/ox/fs/filesystem.hpp
index 58476c3ad..12db462dc 100644
--- a/src/ox/fs/filesystem.hpp
+++ b/src/ox/fs/filesystem.hpp
@@ -206,7 +206,7 @@ int FileSystemTemplate<FileStore>::write(uint64_t inode, void *buffer, uint64_t
 #endif
 template<typename FileStore>
 uint8_t *FileSystemTemplate<FileStore>::format(void *buffer, typename FileStore::FsSize_t size, bool useDirectories) {
-	buffer = FileStore::format((uint8_t*) buffer, size, FS_TYPE);
+	buffer = FileStore::format((uint8_t*) buffer, size, (uint32_t) FileSystemTemplate<FileStore>::FS_TYPE);
 	auto fs = createFileSystem(buffer);
 
 	if (buffer && useDirectories) {
diff --git a/src/ox/fs/oxfstool.cpp b/src/ox/fs/oxfstool.cpp
index baed8b380..c99592c01 100644
--- a/src/ox/fs/oxfstool.cpp
+++ b/src/ox/fs/oxfstool.cpp
@@ -70,7 +70,7 @@ uint64_t bytes(const char *str) {
 		}
 	}
 	const auto retval = ((uint64_t) ::ox_atoi(copy)) * multiplier;
-	delete copy;
+	delete []copy;
 	return  retval;
 }
 
diff --git a/src/ox/std/types.hpp b/src/ox/std/types.hpp
index 0c62a2472..1c16af4ec 100644
--- a/src/ox/std/types.hpp
+++ b/src/ox/std/types.hpp
@@ -7,14 +7,14 @@
  */
 #pragma once
 
-typedef char               int8_t;
+typedef signed char        int8_t;
 typedef unsigned char      uint8_t;
 typedef short              int16_t;
 typedef unsigned short     uint16_t;
 typedef int                int32_t;
 typedef unsigned int       uint32_t;
 typedef unsigned           uint_t;
-typedef long long          int64_t;
+typedef long               int64_t;
 typedef unsigned long long uint64_t;
 
 namespace ox {