From e8b27d6935dcb0a2d96bc56f3eea2831672c62af Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Sat, 17 Dec 2016 13:05:39 -0600
Subject: [PATCH] Better define the u/int64 types between different compilers

---
 src/ox/std/types.hpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ox/std/types.hpp b/src/ox/std/types.hpp
index 6d03aa47c..83fcf4c91 100644
--- a/src/ox/std/types.hpp
+++ b/src/ox/std/types.hpp
@@ -14,6 +14,13 @@ typedef unsigned short     uint16_t;
 typedef int                int32_t;
 typedef unsigned int       uint32_t;
 typedef unsigned           uint_t;
+#ifdef _MSC_VER
+typedef long               int64_t;
+typedef unsigned long      uint64_t;
+#else
+typedef long long          int64_t;
+typedef unsigned long long uint64_t;
+#endif
 
 namespace ox {
 namespace std {
@@ -26,12 +33,8 @@ typedef uint32_t Error;
 #if defined(_LP64) || defined(__ppc64__) || defined(__aarch64__)
 typedef unsigned long size_t;
 #elif defined(_WIN64)
-typedef long               int64_t;
-typedef unsigned long      uint64_t;
 typedef uint64_t size_t;
 #elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__)
-typedef long long          int64_t;
-typedef unsigned long long uint64_t;
 typedef uint32_t size_t;
 #else
 #error size_t undefined