diff --git a/src/System.h b/src/System.h index 7c102e16..9137227b 100644 --- a/src/System.h +++ b/src/System.h @@ -20,9 +20,7 @@ #ifndef VBA_SYSTEM_H #define VBA_SYSTEM_H -#ifndef _MSC_VER #include -#endif #include "unzip.h" @@ -30,7 +28,7 @@ #define NULL 0 #endif -#ifndef _MSC_VER + typedef uint8_t u8; typedef uint16_t u16; typedef uint32_t u32; @@ -41,13 +39,7 @@ typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; -#else -typedef unsigned __int64 u64; -typedef signed char s8; -typedef signed short s16; -typedef signed int s32; -typedef signed __int64 s64; -#endif + typedef unsigned char u8; typedef unsigned short u16; diff --git a/src/hq3x32.cpp b/src/hq3x32.cpp index 366e4a41..0e50a9b3 100644 --- a/src/hq3x32.cpp +++ b/src/hq3x32.cpp @@ -18,12 +18,7 @@ #include "Util.h" #define __STDC_CONSTANT_MACROS -#ifndef _MSC_VER #include -#else -typedef unsigned int uint32_t; -#endif - extern "C" { diff --git a/src/hq_shared32.cpp b/src/hq_shared32.cpp index 400e6c8a..4b10caaa 100644 --- a/src/hq_shared32.cpp +++ b/src/hq_shared32.cpp @@ -19,12 +19,9 @@ #include "hq_shared32.h" #define __STDC_CONSTANT_MACROS -#ifndef _MSC_VER + #include -#else -typedef unsigned __int64 uint64_t; -#define UINT64_C(x) x; -#endif + const uint64_t reg_blank = UINT64_C(0x0000000000000000); const uint64_t const7 = UINT64_C(0x0000000700070007); diff --git a/src/interp.h b/src/interp.h index f26a71f3..57a329c1 100644 --- a/src/interp.h +++ b/src/interp.h @@ -33,12 +33,8 @@ #define __STDC_CONSTANT_MACROS -#ifndef _MSC_VER #include -#else -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#endif + typedef uint16_t interp_uint16; typedef uint32_t interp_uint32;