remove myinttypes.h

2024-11-23 13:39:46 +00:00 · 2016-04-26 09:47:30 +08:00 · 2016-04-26 09:47:30 +08:00 · 3f461adae3
commit 3f461adae3
parent 9ec3345ed6
32 changed files with 29 additions and 42 deletions
--- 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
    )

--- a/SStream.c
+++ b/SStream.c
@ -12,7 +12,8 @@
 #endif
 #include <string.h>

-#include "myinttypes.h"
+#include <platform.h>
+
 #include "SStream.h"
 #include "cs_priv.h"
 #include "utils.h"
--- a/arch/AArch64/AArch64InstPrinter.c
+++ b/arch/AArch64/AArch64InstPrinter.c
@ -16,7 +16,7 @@

 #ifdef CAPSTONE_HAS_ARM64

-#include "../../myinttypes.h"
+#include <platform.h>
 #include <stdio.h>
 #include <stdlib.h>

--- a/arch/ARM/ARMDisassembler.c
+++ b/arch/ARM/ARMDisassembler.c
@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../../myinttypes.h"
+#include <platform.h>

 #include "ARMAddressingModes.h"
 #include "ARMBaseInfo.h"
--- a/arch/ARM/ARMInstPrinter.c
+++ b/arch/ARM/ARMInstPrinter.c
@ -19,7 +19,7 @@
 #include <stdio.h>	// DEBUG
 #include <stdlib.h>
 #include <string.h>
-#include "../../myinttypes.h"
+#include <platform.h>

 #include "ARMInstPrinter.h"
 #include "ARMAddressingModes.h"
--- a/arch/Mips/MipsDisassembler.c
+++ b/arch/Mips/MipsDisassembler.c
@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>

-#include "../../myinttypes.h"
+#include <platform.h>

 #include "../../utils.h"

--- a/arch/Mips/MipsInstPrinter.c
+++ b/arch/Mips/MipsInstPrinter.c
@ -16,7 +16,7 @@

 #ifdef CAPSTONE_HAS_MIPS

-#include "../../myinttypes.h"
+#include <platform.h>
 #include <stdlib.h>
 #include <stdio.h>	// debug
 #include <string.h>
--- a/arch/PowerPC/PPCGenAsmWriter.inc
+++ b/arch/PowerPC/PPCGenAsmWriter.inc
@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.h>

 /// printInstruction - This method is automatically generated by tablegen
 /// from the instruction set description.
--- a/arch/Sparc/SparcGenAsmWriter.inc
+++ b/arch/Sparc/SparcGenAsmWriter.inc
@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.h>


 /// printInstruction - This method is automatically generated by tablegen
--- a/arch/SystemZ/SystemZGenAsmWriter.inc
+++ b/arch/SystemZ/SystemZGenAsmWriter.inc
@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.h>


 /// printInstruction - This method is automatically generated by tablegen
--- a/arch/SystemZ/SystemZInstPrinter.c
+++ b/arch/SystemZ/SystemZInstPrinter.c
@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../myinttypes.h"
+#include <platform.h>

 #include "SystemZInstPrinter.h"
 #include "../../MCInst.h"
--- a/arch/X86/X86ATTInstPrinter.c
+++ b/arch/X86/X86ATTInstPrinter.c
@ -21,7 +21,7 @@
 #if !defined(CAPSTONE_HAS_OSXKERNEL)
 #include <ctype.h>
 #endif
-#include "../../myinttypes.h"
+#include <platform.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>
 #else
--- a/arch/X86/X86Disassembler.c
+++ b/arch/X86/X86Disassembler.c
@ -19,7 +19,6 @@

 #ifdef CAPSTONE_HAS_X86

-#include "../../myinttypes.h"	// debug
 #include <string.h>

 #include "../../cs_priv.h"
--- a/arch/X86/X86IntelInstPrinter.c
+++ b/arch/X86/X86IntelInstPrinter.c
@ -20,7 +20,7 @@
 #if !defined(CAPSTONE_HAS_OSXKERNEL)
 #include <ctype.h>
 #endif
-#include "../../myinttypes.h"
+#include <platform.h>
 #if defined(CAPSTONE_HAS_OSXKERNEL)
 #include <libkern/libkern.h>
 #else
--- a/arch/XCore/XCoreGenAsmWriter.inc
+++ b/arch/XCore/XCoreGenAsmWriter.inc
@ -10,7 +10,7 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>	// debug
-#include "../../myinttypes.h"
+#include <platform.h>


 /// printInstruction - This method is automatically generated by tablegen
--- a/arch/XCore/XCoreInstPrinter.c
+++ b/arch/XCore/XCoreInstPrinter.c
@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../myinttypes.h"
+#include <platform.h>

 #include "XCoreInstPrinter.h"
 #include "../../MCInst.h"
--- a/myinttypes.h
+++ b/myinttypes.h
@ -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 <platform.h>
-
-#endif
--- a/suite/arm/test_arm_regression.c
+++ b/suite/arm/test_arm_regression.c
@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 static csh handle;
--- a/suite/benchmark/test_iter_benchmark.c
+++ b/suite/benchmark/test_iter_benchmark.c
@ -4,8 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 static void test()
--- a/tests/test.c
+++ b/tests/test.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_arm.c
+++ b/tests/test_arm.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 static csh handle;
--- a/tests/test_arm64.c
+++ b/tests/test_arm64.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 static csh handle;
--- a/tests/test_detail.c
+++ b/tests/test_detail.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- 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 <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_mips.c
+++ b/tests/test_mips.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_ppc.c
+++ b/tests/test_ppc.c
@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013> */

 #include <stdio.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_skipdata.c
+++ b/tests/test_skipdata.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_sparc.c
+++ b/tests/test_sparc.c
@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_systemz.c
+++ b/tests/test_systemz.c
@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- a/tests/test_x86.c
+++ b/tests/test_x86.c
@ -3,8 +3,8 @@

 #include <stdio.h>
 #include <stdlib.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 static csh handle;
--- a/tests/test_xcore.c
+++ b/tests/test_xcore.c
@ -2,8 +2,8 @@
 /* By Nguyen Anh Quynh <aquynh@gmail.com>, 2013-2014 */

 #include <stdio.h>
-#include "../myinttypes.h"

+#include <platform.h>
 #include <capstone.h>

 struct platform {
--- 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 = "<group>"; };
 		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 = "<group>"; };
-		DC696C5E1AD4600200A56306 /* myinttypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = myinttypes.h; path = ../myinttypes.h; sourceTree = "<group>"; };
 		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 = "<group>"; };
@ -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 */,