diff --git a/include/arm.h b/include/arm.h index 73c5135f..c6ab15f0 100644 --- a/include/arm.h +++ b/include/arm.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" #ifdef _MSC_VER diff --git a/include/arm64.h b/include/arm64.h index e626f0e9..5091010a 100644 --- a/include/arm64.h +++ b/include/arm64.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" #ifdef _MSC_VER diff --git a/include/capstone.h b/include/capstone.h index 99fc33ec..867ed902 100644 --- a/include/capstone.h +++ b/include/capstone.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include #if defined(CAPSTONE_HAS_OSXKERNEL) diff --git a/include/mips.h b/include/mips.h index d467f0d7..d238fda5 100644 --- a/include/mips.h +++ b/include/mips.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" // GCC MIPS toolchain has a default macro called "mips" which breaks diff --git a/include/ppc.h b/include/ppc.h index 01bc3485..b67df6d5 100644 --- a/include/ppc.h +++ b/include/ppc.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" #ifdef _MSC_VER diff --git a/include/sparc.h b/include/sparc.h index 60a1e53e..a1fccfaa 100644 --- a/include/sparc.h +++ b/include/sparc.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" // GCC SPARC toolchain has a default macro called "sparc" which breaks diff --git a/include/systemz.h b/include/systemz.h index 96c3993d..3020bd7e 100644 --- a/include/systemz.h +++ b/include/systemz.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" #ifdef _MSC_VER diff --git a/include/x86.h b/include/x86.h index 89216644..a2b4976c 100644 --- a/include/x86.h +++ b/include/x86.h @@ -8,7 +8,9 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif // Calculate relative address for X86-64, given cs_insn structure #define X86_REL_ADDR(insn) (insn.address + insn.size + insn.detail->x86.disp) diff --git a/include/xcore.h b/include/xcore.h index ff6a5d25..aaf59129 100644 --- a/include/xcore.h +++ b/include/xcore.h @@ -8,7 +8,10 @@ extern "C" { #endif +#if !defined(_MSC_VER) || !defined(_KERNEL_MODE) #include +#endif + #include "platform.h" #ifdef _MSC_VER