diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-03-03 13:39:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 14:07:04 +0100 |
| commit | 0fe950d1c05a633e737a0dab3d91d33fe0994141 (patch) | |
| tree | 23a82b3cb1210c9e9d0ebf9083396083d93271d7 /src/3rdparty/masm/disassembler | |
| parent | 151f750638d605ef19c62b2714d80e7780bfce8f (diff) | |
V4 JIT: enable disassembler on windows.
Change-Id: I55a2a96a1a774c79cc2146c6b47d441fede1d102
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/disassembler')
| -rw-r--r-- | src/3rdparty/masm/disassembler/udis86/udis86_decode.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/disassembler/udis86/udis86_types.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/masm/disassembler/udis86/udis86_decode.c b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c index 3d567b6df2..2ebd56b2a9 100644 --- a/src/3rdparty/masm/disassembler/udis86/udis86_decode.c +++ b/src/3rdparty/masm/disassembler/udis86/udis86_decode.c @@ -34,8 +34,10 @@ #include "udis86_decode.h" #include <wtf/Assertions.h> +#ifndef _MSC_VER #define dbg(x, n...) /* #define dbg printf */ +#endif // _MSC_VER #ifndef __UD_STANDALONE__ # include <string.h> diff --git a/src/3rdparty/masm/disassembler/udis86/udis86_types.h b/src/3rdparty/masm/disassembler/udis86/udis86_types.h index 320d1ca491..520a24c541 100644 --- a/src/3rdparty/masm/disassembler/udis86/udis86_types.h +++ b/src/3rdparty/masm/disassembler/udis86/udis86_types.h @@ -43,10 +43,12 @@ typedef unsigned __int16 uint16_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; +# ifndef _STDINT typedef __int8 int8_t; typedef __int16 int16_t; typedef __int32 int32_t; typedef __int64 int64_t; +# endif #else # define FMT64 "%ll" # ifndef __UD_STANDALONE__ |