2 files changed, 12 insertions, 32 deletions

diff --git a/src/common/common_types.h b/src/common/common_types.h
index 00fde828d..7ce6b2240 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -25,42 +25,21 @@
 #pragma once 
 
 #include <cmath>
+#include <cstdint>
 #include <xmmintrin.h> // data_types__m128.cpp
 
-#ifdef _WIN32
+typedef std::uint8_t  u8;  ///< 8-bit unsigned byte
+typedef std::uint16_t u16; ///< 16-bit unsigned short
+typedef std::uint32_t u32; ///< 32-bit unsigned word
+typedef std::uint64_t u64; ///< 64-bit unsigned int
 
-#include <tchar.h>
+typedef std::int8_t  s8;  ///< 8-bit signed byte
+typedef std::int16_t s16; ///< 16-bit signed short
+typedef std::int32_t s32; ///< 32-bit signed word
+typedef std::int64_t s64; ///< 64-bit signed int
 
-typedef unsigned __int8     u8;     ///< 8-bit unsigned byte
-typedef unsigned __int16    u16;    ///< 16-bit unsigned short
-typedef unsigned __int32    u32;    ///< 32-bit unsigned word
-typedef unsigned __int64    u64;    ///< 64-bit unsigned int
-
-typedef signed __int8       s8;     ///< 8-bit signed byte
-typedef signed __int16      s16;    ///< 16-bit signed short
-typedef signed __int32      s32;    ///< 32-bit signed word
-typedef signed __int64      s64;    ///< 64-bit signed int
-
-#else
-
-typedef unsigned char       u8;     ///< 8-bit unsigned byte
-typedef unsigned short      u16;    ///< 16-bit unsigned short
-typedef unsigned int        u32;    ///< 32-bit unsigned word
-typedef unsigned long long  u64;    ///< 64-bit unsigned int
-
-typedef signed char         s8;     ///< 8-bit signed byte
-typedef signed short        s16;    ///< 16-bit signed short
-typedef signed int          s32;    ///< 32-bit signed word
-typedef signed long long    s64;    ///< 64-bit signed int
-
-// For using windows lock code
-#define TCHAR char
-#define LONG int
-
-#endif // _WIN32
-
-typedef float   f32;    ///< 32-bit floating point
-typedef double  f64;    ///< 64-bit floating point
+typedef float   f32; ///< 32-bit floating point
+typedef double  f64; ///< 64-bit floating point
 
 #include "common/common.h"
 
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 78a642599..77a226885 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -13,6 +13,7 @@
 #include <commdlg.h>    // for GetSaveFileName
 #include <io.h>
 #include <direct.h>        // getcwd
+#include <tchar.h>
 #else
 #include <sys/param.h>
 #include <dirent.h>