Merge branch 'master' into develop

This commit is contained in:
athre0z 2015-05-21 17:16:45 +02:00
commit 999c105707
2 changed files with 3 additions and 1 deletions

View File

@ -32,6 +32,7 @@
#include <stdio.h>
#include <stdint.h>
#include <inttypes.h>
void PrintZydisError()
{
@ -153,7 +154,7 @@ int main()
puts("64 bit test ...\n\n");
while (ZydisDecodeInstruction(decoder, &info))
{
printf("%016llX ", info.instrAddress);
printf("%016"PRIu64"X ", info.instrAddress);
if (info.flags & ZYDIS_IF_ERROR_MASK)
{
printf("db %02X", info.data[0]);

View File

@ -33,6 +33,7 @@
#include <cstdarg>
#include <cctype>
#include <cstdio>
#include <cstring>
namespace Zydis
{