Workaround missing <inttypes.h> on MSVC 2010

SStream.c

@@ -2,13 +2,13 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdint.h>
-#include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "SStream.h"
 #include "cs_priv.h"
+#include "inttypes.h"
 #include "utils.h"
 
 #ifdef _MSC_VER

arch/AArch64/AArch64InstPrinter.c

@@ -16,7 +16,7 @@
 
 #ifdef CAPSTONE_HAS_ARM64
 
-#include <inttypes.h>
+#include "../../inttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 

arch/ARM/ARMDisassembler.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 #include "ARMAddressingModes.h"
 #include "ARMBaseInfo.h"

arch/ARM/ARMInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>	// DEBUG
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h> 
+#include "../../inttypes.h"
 
 #include "ARMInstPrinter.h"
 #include "ARMAddressingModes.h"

arch/Mips/MipsDisassembler.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <inttypes.h> 
+#include "../../inttypes.h"
 
 #include "../../utils.h"
 

arch/Mips/MipsInstPrinter.c

@@ -16,7 +16,7 @@
 
 #ifdef CAPSTONE_HAS_MIPS
 
-#include <inttypes.h>
+#include "../../inttypes.h"
 #include <stdlib.h>
 #include <stdio.h>	// debug
 #include <string.h>

arch/PowerPC/PPCGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 /// printInstruction - This method is automatically generated by tablegen
 /// from the instruction set description.

arch/Sparc/SparcGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/SystemZ/SystemZGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/SystemZ/SystemZInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 #include "SystemZInstPrinter.h"
 #include "../../MCInst.h"

arch/X86/X86ATTInstPrinter.c

@@ -19,7 +19,7 @@
 #if defined(CAPSTONE_HAS_X86) && !defined(CAPSTONE_DIET) && !defined(CAPSTONE_X86_ATT_DISABLE)
 
 #include <ctype.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

arch/X86/X86Disassembler.c

@@ -19,7 +19,7 @@
 
 #ifdef CAPSTONE_HAS_X86
 
-#include <inttypes.h>	// debug
+#include "../../inttypes.h"	// debug
 #include <string.h>
 
 #include "../../cs_priv.h"

arch/X86/X86IntelInstPrinter.c

@@ -18,7 +18,7 @@
 #ifdef CAPSTONE_HAS_X86
 
 #include <ctype.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

arch/XCore/XCoreGenAsmWriter.inc

@@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>	// debug
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 
 /// printInstruction - This method is automatically generated by tablegen

arch/XCore/XCoreInstPrinter.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 #include "XCoreInstPrinter.h"
 #include "../../MCInst.h"

inttypes.h

@@ -0,0 +1,5 @@
+#if defined(_MSC_VER) && _MSC_VER < 1700
+#include "msvc/headers/inttypes.h"
+#else
+#include <inttypes.h>
+#endif

suite/arm/test_arm_regression.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
+#include "../../inttypes.h"
 
 #include <capstone/capstone.h>
 

tests/test.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_arm.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_arm64.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_detail.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_mips.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_ppc.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013> */
 
 #include <stdio.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_skipdata.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_sparc.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_systemz.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_x86.c

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>
 

tests/test_xcore.c

@@ -2,7 +2,7 @@
 /* By Nguyen Anh Quynh <[email protected]>, 2013-2014 */
 
 #include <stdio.h>
-#include <inttypes.h>
+#include "../inttypes.h"
 
 #include <capstone.h>