From 736656f7d694db3d1e9069f2696fbc90afdc8b05 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 13 Nov 2015 09:30:48 +0100 Subject: [PATCH] gsdx: properly defined type for xbyak Compatible 64 bits and avoid local modification --- plugins/GSdx/stdafx.h | 5 +++++ plugins/GSdx/xbyak/xbyak.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h index e8e4052404..7c80d746cd 100644 --- a/plugins/GSdx/stdafx.h +++ b/plugins/GSdx/stdafx.h @@ -75,6 +75,11 @@ typedef uint64 uptr; typedef uint32 uptr; #endif + +// xbyak compatibilities +typedef int64 sint64; +#define MIE_INTEGER_TYPE_DEFINED + // stdc #include diff --git a/plugins/GSdx/xbyak/xbyak.h b/plugins/GSdx/xbyak/xbyak.h index d108247e02..4f0f85e8bf 100644 --- a/plugins/GSdx/xbyak/xbyak.h +++ b/plugins/GSdx/xbyak/xbyak.h @@ -130,7 +130,7 @@ enum { DEFAULT_MAX_CODE_SIZE = 4096, VERSION = 0x4840 /* 0xABCD = A.BC(D) */ }; -/* + #ifndef MIE_INTEGER_TYPE_DEFINED #define MIE_INTEGER_TYPE_DEFINED #ifdef _MSC_VER @@ -144,7 +144,7 @@ typedef unsigned int uint32; typedef unsigned short uint16; typedef unsigned char uint8; #endif -*/ + #ifndef MIE_ALIGN #ifdef _MSC_VER #define MIE_ALIGN(x) __declspec(align(x))