diff --git a/CMakeLists.txt b/CMakeLists.txt index c2b1c111c..239ba5ea1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,6 @@ set(HEADERS_ENGINE MCInstrDesc.h SStream.h cs_priv.h - myinttypes.h include/platform.h ) diff --git a/SStream.c b/SStream.c index 3f648ccb7..2228e99a8 100644 --- a/SStream.c +++ b/SStream.c @@ -12,7 +12,8 @@ #endif #include -#include "myinttypes.h" +#include + #include "SStream.h" #include "cs_priv.h" #include "utils.h" diff --git a/arch/AArch64/AArch64InstPrinter.c b/arch/AArch64/AArch64InstPrinter.c index 65825c276..19c46598c 100644 --- a/arch/AArch64/AArch64InstPrinter.c +++ b/arch/AArch64/AArch64InstPrinter.c @@ -16,7 +16,7 @@ #ifdef CAPSTONE_HAS_ARM64 -#include "../../myinttypes.h" +#include #include #include diff --git a/arch/ARM/ARMDisassembler.c b/arch/ARM/ARMDisassembler.c index b4dbb43d9..e7dd7a7ed 100644 --- a/arch/ARM/ARMDisassembler.c +++ b/arch/ARM/ARMDisassembler.c @@ -15,7 +15,7 @@ #include #include #include -#include "../../myinttypes.h" +#include #include "ARMAddressingModes.h" #include "ARMBaseInfo.h" diff --git a/arch/ARM/ARMInstPrinter.c b/arch/ARM/ARMInstPrinter.c index c73a71350..bdca3e7e1 100644 --- a/arch/ARM/ARMInstPrinter.c +++ b/arch/ARM/ARMInstPrinter.c @@ -19,7 +19,7 @@ #include // DEBUG #include #include -#include "../../myinttypes.h" +#include #include "ARMInstPrinter.h" #include "ARMAddressingModes.h" diff --git a/arch/Mips/MipsDisassembler.c b/arch/Mips/MipsDisassembler.c index 818a1deb2..4e837db19 100644 --- a/arch/Mips/MipsDisassembler.c +++ b/arch/Mips/MipsDisassembler.c @@ -19,7 +19,7 @@ #include #include -#include "../../myinttypes.h" +#include #include "../../utils.h" diff --git a/arch/Mips/MipsInstPrinter.c b/arch/Mips/MipsInstPrinter.c index accce4404..6dbbac2ce 100644 --- a/arch/Mips/MipsInstPrinter.c +++ b/arch/Mips/MipsInstPrinter.c @@ -16,7 +16,7 @@ #ifdef CAPSTONE_HAS_MIPS -#include "../../myinttypes.h" +#include #include #include // debug #include diff --git a/arch/PowerPC/PPCGenAsmWriter.inc b/arch/PowerPC/PPCGenAsmWriter.inc index 7d9ad7383..689216cba 100644 --- a/arch/PowerPC/PPCGenAsmWriter.inc +++ b/arch/PowerPC/PPCGenAsmWriter.inc @@ -10,7 +10,7 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include // debug -#include "../../myinttypes.h" +#include /// printInstruction - This method is automatically generated by tablegen /// from the instruction set description. diff --git a/arch/Sparc/SparcGenAsmWriter.inc b/arch/Sparc/SparcGenAsmWriter.inc index 239f62051..b8f34959d 100644 --- a/arch/Sparc/SparcGenAsmWriter.inc +++ b/arch/Sparc/SparcGenAsmWriter.inc @@ -10,7 +10,7 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include // debug -#include "../../myinttypes.h" +#include /// printInstruction - This method is automatically generated by tablegen diff --git a/arch/SystemZ/SystemZGenAsmWriter.inc b/arch/SystemZ/SystemZGenAsmWriter.inc index f86413742..8ffc29d61 100644 --- a/arch/SystemZ/SystemZGenAsmWriter.inc +++ b/arch/SystemZ/SystemZGenAsmWriter.inc @@ -10,7 +10,7 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include // debug -#include "../../myinttypes.h" +#include /// printInstruction - This method is automatically generated by tablegen diff --git a/arch/SystemZ/SystemZInstPrinter.c b/arch/SystemZ/SystemZInstPrinter.c index 10adf135d..2b9cbff00 100644 --- a/arch/SystemZ/SystemZInstPrinter.c +++ b/arch/SystemZ/SystemZInstPrinter.c @@ -19,7 +19,7 @@ #include #include #include -#include "../../myinttypes.h" +#include #include "SystemZInstPrinter.h" #include "../../MCInst.h" diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c index 7f53cf86c..78fad0c73 100644 --- a/arch/X86/X86ATTInstPrinter.c +++ b/arch/X86/X86ATTInstPrinter.c @@ -21,7 +21,7 @@ #if !defined(CAPSTONE_HAS_OSXKERNEL) #include #endif -#include "../../myinttypes.h" +#include #if defined(CAPSTONE_HAS_OSXKERNEL) #include #else diff --git a/arch/X86/X86Disassembler.c b/arch/X86/X86Disassembler.c index 1814c4473..dccb30821 100644 --- a/arch/X86/X86Disassembler.c +++ b/arch/X86/X86Disassembler.c @@ -19,7 +19,6 @@ #ifdef CAPSTONE_HAS_X86 -#include "../../myinttypes.h" // debug #include #include "../../cs_priv.h" diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c index 001feb9cf..9bd94cb44 100644 --- a/arch/X86/X86IntelInstPrinter.c +++ b/arch/X86/X86IntelInstPrinter.c @@ -20,7 +20,7 @@ #if !defined(CAPSTONE_HAS_OSXKERNEL) #include #endif -#include "../../myinttypes.h" +#include #if defined(CAPSTONE_HAS_OSXKERNEL) #include #else diff --git a/arch/XCore/XCoreGenAsmWriter.inc b/arch/XCore/XCoreGenAsmWriter.inc index d179930d6..72ca2f8cf 100644 --- a/arch/XCore/XCoreGenAsmWriter.inc +++ b/arch/XCore/XCoreGenAsmWriter.inc @@ -10,7 +10,7 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include // debug -#include "../../myinttypes.h" +#include /// printInstruction - This method is automatically generated by tablegen diff --git a/arch/XCore/XCoreInstPrinter.c b/arch/XCore/XCoreInstPrinter.c index bafe5ba09..e23fa4c7d 100644 --- a/arch/XCore/XCoreInstPrinter.c +++ b/arch/XCore/XCoreInstPrinter.c @@ -19,7 +19,7 @@ #include #include #include -#include "../../myinttypes.h" +#include #include "XCoreInstPrinter.h" #include "../../MCInst.h" diff --git a/myinttypes.h b/myinttypes.h deleted file mode 100644 index 035646740..000000000 --- a/myinttypes.h +++ /dev/null @@ -1,10 +0,0 @@ -/* Capstone Disassembly Engine */ -/* By Axel Souchet, 2014 */ - -#ifndef CS_MYINTTYPES_H -#define CS_MYINTTYPES_H - -// The contents of myinttype.h are moved to platform.h -#include - -#endif diff --git a/suite/arm/test_arm_regression.c b/suite/arm/test_arm_regression.c index f5bddfb8b..8b87f164b 100644 --- a/suite/arm/test_arm_regression.c +++ b/suite/arm/test_arm_regression.c @@ -9,8 +9,8 @@ #include #include #include -#include "../../myinttypes.h" +#include #include static csh handle; diff --git a/suite/benchmark/test_iter_benchmark.c b/suite/benchmark/test_iter_benchmark.c index 0c04b8f0b..39cd39d64 100644 --- a/suite/benchmark/test_iter_benchmark.c +++ b/suite/benchmark/test_iter_benchmark.c @@ -4,8 +4,8 @@ #include #include #include -#include "../myinttypes.h" +#include #include static void test() diff --git a/tests/test.c b/tests/test.c index 0ab6f4ef8..afff7a980 100644 --- a/tests/test.c +++ b/tests/test.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_arm.c b/tests/test_arm.c index bd31d3140..1af84be71 100644 --- a/tests/test_arm.c +++ b/tests/test_arm.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include static csh handle; diff --git a/tests/test_arm64.c b/tests/test_arm64.c index ea35da6c6..6a9f8daeb 100644 --- a/tests/test_arm64.c +++ b/tests/test_arm64.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include static csh handle; diff --git a/tests/test_detail.c b/tests/test_detail.c index 75853f7ea..2d205f209 100644 --- a/tests/test_detail.c +++ b/tests/test_detail.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_iter.c b/tests/test_iter.c index c393254b9..623889d68 100644 --- a/tests/test_iter.c +++ b/tests/test_iter.c @@ -4,8 +4,8 @@ // This sample code demonstrates the APIs cs_malloc() & cs_disasm_iter(). #include #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_mips.c b/tests/test_mips.c index feafd289c..f5795b871 100644 --- a/tests/test_mips.c +++ b/tests/test_mips.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_ppc.c b/tests/test_ppc.c index 3fe229256..36a8b2d32 100644 --- a/tests/test_ppc.c +++ b/tests/test_ppc.c @@ -2,8 +2,8 @@ /* By Nguyen Anh Quynh , 2013> */ #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_skipdata.c b/tests/test_skipdata.c index 7fb78e04a..8e4a21cbd 100644 --- a/tests/test_skipdata.c +++ b/tests/test_skipdata.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_sparc.c b/tests/test_sparc.c index 522d82391..60f9487ab 100644 --- a/tests/test_sparc.c +++ b/tests/test_sparc.c @@ -2,8 +2,8 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_systemz.c b/tests/test_systemz.c index abbc73469..209a7bf16 100644 --- a/tests/test_systemz.c +++ b/tests/test_systemz.c @@ -2,8 +2,8 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/tests/test_x86.c b/tests/test_x86.c index 880d03a68..af893c81f 100644 --- a/tests/test_x86.c +++ b/tests/test_x86.c @@ -3,8 +3,8 @@ #include #include -#include "../myinttypes.h" +#include #include static csh handle; diff --git a/tests/test_xcore.c b/tests/test_xcore.c index 32a9ec0cc..958565531 100644 --- a/tests/test_xcore.c +++ b/tests/test_xcore.c @@ -2,8 +2,8 @@ /* By Nguyen Anh Quynh , 2013-2014 */ #include -#include "../myinttypes.h" +#include #include struct platform { diff --git a/xcode/Capstone.xcodeproj/project.pbxproj b/xcode/Capstone.xcodeproj/project.pbxproj index bcce829c5..5bd6c6889 100644 --- a/xcode/Capstone.xcodeproj/project.pbxproj +++ b/xcode/Capstone.xcodeproj/project.pbxproj @@ -308,7 +308,6 @@ DC474F6B19DE6F3B00BCA449 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DC5BFF4019EE544E008CA585 /* test_iter */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_iter; sourceTree = BUILT_PRODUCTS_DIR; }; DC5BFF4819EE54BE008CA585 /* test_iter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = test_iter.c; path = ../tests/test_iter.c; sourceTree = ""; }; - DC696C5E1AD4600200A56306 /* myinttypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = myinttypes.h; path = ../myinttypes.h; sourceTree = ""; }; DCFE23BD19DDCC2D00EF8EA9 /* libcapstone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcapstone.a; sourceTree = BUILT_PRODUCTS_DIR; }; DCFE23CD19DDCC9500EF8EA9 /* libcapstone.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcapstone.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; DCFE23DD19DDCD8700EF8EA9 /* AArch64AddressingModes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AArch64AddressingModes.h; sourceTree = ""; }; @@ -617,7 +616,6 @@ DCFE24B719DDCE1E00EF8EA9 /* MCInstrDesc.h */, DCFE24A019DDCDEE00EF8EA9 /* MCRegisterInfo.c */, DCFE24B819DDCE1E00EF8EA9 /* MCRegisterInfo.h */, - DC696C5E1AD4600200A56306 /* myinttypes.h */, DCFE24A119DDCDEE00EF8EA9 /* SStream.c */, DCFE24B919DDCE1E00EF8EA9 /* SStream.h */, DCFE24A219DDCDEE00EF8EA9 /* utils.c */,