platform.h move #3

bindings/java/unicorn_Unicorn.c

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <sys/types.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 

bindings/msvc/samples/main.c

@@ -22,7 +22,7 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

bindings/msvc_native/unicorn/unicorn.vcxproj

@@ -63,13 +63,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\list.h" />
-    <ClInclude Include="..\..\..\include\platform.h" />
     <ClInclude Include="..\..\..\include\qemu.h" />
     <ClInclude Include="..\..\..\include\uc_priv.h" />
     <ClInclude Include="..\..\..\include\unicorn\arm.h" />
     <ClInclude Include="..\..\..\include\unicorn\arm64.h" />
     <ClInclude Include="..\..\..\include\unicorn\m68k.h" />
     <ClInclude Include="..\..\..\include\unicorn\mips.h" />
+    <ClInclude Include="..\..\..\include\unicorn\platform.h" />
     <ClInclude Include="..\..\..\include\unicorn\sparc.h" />
     <ClInclude Include="..\..\..\include\unicorn\unicorn.h" />
     <ClInclude Include="..\..\..\include\unicorn\x86.h" />

bindings/msvc_native/unicorn/unicorn.vcxproj.filters

@@ -493,8 +493,6 @@
     <ClInclude Include="..\..\..\include\unicorn\sparc.h" />
     <ClInclude Include="..\..\..\include\unicorn\unicorn.h" />
     <ClInclude Include="..\..\..\include\unicorn\x86.h" />
-    <ClInclude Include="..\..\..\include\platform.h">
-      <Filter>priv</Filter>
-    </ClInclude>
+    <ClInclude Include="..\..\..\include\unicorn\platform.h" />
   </ItemGroup>
 </Project>

include/list.h

@@ -1,7 +1,7 @@
 #ifndef UC_LLIST_H
 #define UC_LLIST_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 struct list_item {
     struct list_item *next;

include/uc_priv.h

@@ -4,7 +4,7 @@
 #ifndef UC_PRIV_H
 #define UC_PRIV_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdio.h>
 
 #include "qemu.h"

include/unicorn/m68k.h

@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4201)

include/unicorn/sparc.h

@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 // GCC SPARC toolchain has a default macro called "sparc" which breaks
 // compilation

include/unicorn/unicorn.h

@@ -12,7 +12,7 @@ extern "C" {
 #pragma comment(lib, "unicorn.lib")
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdarg.h>
 #if defined(UNICORN_HAS_OSXKERNEL)
 #include <libkern/libkern.h>

include/unicorn/x86.h

@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 // Memory-Management Register for instructions IDTR, GDTR, LDTR, TR.
 // Borrow from SegmentCache in qemu/target-i386/cpu.h

list.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "list.h"
 
 // simple linked list implementation

qemu/include/elf.h

@@ -1,7 +1,7 @@
 #ifndef _QEMU_ELF_H
 #define _QEMU_ELF_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 /* 32-bit ELF base types. */
 typedef uint32_t Elf32_Addr;

qemu/include/exec/cpu-defs.h

@@ -24,7 +24,7 @@
 #endif
 
 #include "config.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/osdep.h"
 #include "qemu/queue.h"
 #ifndef CONFIG_USER_ONLY

qemu/include/exec/hwaddr.h

@@ -7,7 +7,7 @@
 /* hwaddr is the type of a physical address (its size can
    be different from 'target_ulong').  */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 typedef uint64_t hwaddr;
 #define HWADDR_MAX UINT64_MAX

qemu/include/exec/memory.h

@@ -19,7 +19,7 @@
 #define DIRTY_MEMORY_CODE      0
 #define DIRTY_MEMORY_NUM       1        /* num of dirty bits */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu-common.h"
 #include "exec/cpu-common.h"
 #ifndef CONFIG_USER_ONLY

qemu/include/fpu/softfloat.h

@@ -42,7 +42,7 @@ these four paragraphs for those parts of this code that are retained.
 #include <sunmath.h>
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "config-host.h"
 #include "qemu/osdep.h"
 

qemu/include/glib_compat.h

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __GLIB_COMPAT_H
 #define __GLIB_COMPAT_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <assert.h>

qemu/include/qapi/error.h

@@ -14,7 +14,7 @@
 
 #include "qemu/compiler.h"
 #include "qapi-types.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 /**
  * A class representing internal errors within QEMU.  An error has a ErrorClass

qemu/include/qapi/qmp/qbool.h

@@ -14,7 +14,7 @@
 #ifndef QBOOL_H
 #define QBOOL_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"
 
 typedef struct QBool {

qemu/include/qapi/qmp/qdict.h

@@ -16,7 +16,7 @@
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qlist.h"
 #include "qemu/queue.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define QDICT_BUCKET_MAX 512
 

qemu/include/qapi/qmp/qfloat.h

@@ -14,7 +14,7 @@
 #ifndef QFLOAT_H
 #define QFLOAT_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"
 
 typedef struct QFloat {

qemu/include/qapi/qmp/qint.h

@@ -13,7 +13,7 @@
 #ifndef QINT_H
 #define QINT_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"
 
 typedef struct QInt {

qemu/include/qapi/qmp/qstring.h

@@ -13,7 +13,7 @@
 #ifndef QSTRING_H
 #define QSTRING_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qapi/qmp/qobject.h"
 
 typedef struct QString {

qemu/include/qemu-common.h

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
 #include <limits.h>
 #include <time.h>

qemu/include/qemu/bitops.h

@@ -12,7 +12,7 @@
 #ifndef BITOPS_H
 #define BITOPS_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <assert.h>
 
 #include "host-utils.h"

qemu/include/qemu/bswap.h

@@ -2,7 +2,7 @@
 #define BSWAP_H
 
 #include "config-host.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <limits.h>
 #include <string.h>
 #include "fpu/softfloat.h"

qemu/include/qemu/int128.h

@@ -2,7 +2,7 @@
 #define INT128_H
 
 //#include <assert.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 typedef struct Int128 Int128;
 

qemu/include/qemu/log.h

@@ -2,7 +2,7 @@
 #define QEMU_LOG_H
 
 #include <stdarg.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/compiler.h"
 #include "qom/cpu.h"
 

qemu/include/qemu/osdep.h

@@ -4,7 +4,7 @@
 #include "config-host.h"
 #include <stdarg.h>
 #include <stddef.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <sys/types.h>
 #ifdef __OpenBSD__
 #include <sys/signal.h>
@@ -17,7 +17,7 @@
 #define WEXITSTATUS(x) (x)
 #endif
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10
 /* [u]int_fast*_t not in <sys/int_types.h> */

qemu/include/qemu/range.h

@@ -1,7 +1,7 @@
 #ifndef QEMU_RANGE_H
 #define QEMU_RANGE_H
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <qemu/typedefs.h>
 #include "qemu/queue.h"
 

qemu/include/qemu/thread.h

@@ -1,7 +1,7 @@
 #ifndef __QEMU_THREAD_H
 #define __QEMU_THREAD_H 1
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 typedef struct QemuThread QemuThread;
 

qemu/include/qom/object.h

@@ -15,7 +15,7 @@
 #define QEMU_OBJECT_H
 
 #include "glib_compat.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/queue.h"
 #include "qapi/error.h"
 

qemu/target-arm/arm-semi.c

@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>

qemu/target-arm/translate-a64.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "cpu.h"
 #include "tcg-op.h"

qemu/target-arm/translate.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "cpu.h"
 #include "internals.h"

qemu/target-i386/cpu.c

@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "cpu.h"
 #include "sysemu/cpus.h"

qemu/target-i386/topology.h

@@ -38,7 +38,7 @@
  *  CPUID Fn8000_0008_ECX[ApicIdCoreIdSize[3:0]] is set to apicid_core_width().
  */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
 
 #include "qemu/bitops.h"

qemu/target-i386/translate.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <signal.h>
 
 #include "qemu/host-utils.h"

qemu/target-m68k/m68k-semi.c

@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>

qemu/target-mips/helper.c

@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <signal.h>
 
 #include "cpu.h"

qemu/target-sparc/translate.c

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "cpu.h"
 #include "exec/helper-proto.h"

qemu/tcg-runtime.c

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/host-utils.h"
 
 /* This file is compiled once, and thus we can't include the standard

qemu/translate-all.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "config.h"
 

qemu/util/host-utils.c

@@ -24,7 +24,7 @@
  */
 
 #include <stdlib.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include "qemu/host-utils.h"
 
 #ifndef CONFIG_INT128

qemu/util/oslib-posix.c

@@ -39,7 +39,7 @@
 #endif
 #define HUGETLBFS_MAGIC       0x958458f6
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include "config-host.h"
 #include "sysemu/sysemu.h"

qemu/util/qemu-thread-posix.c

@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <time.h>
 #include <signal.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
 #include <limits.h>
 #ifdef __linux__

samples/mem_apis.c

@@ -38,8 +38,8 @@
 
 // posix specific includes
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_arm.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_arm64.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_batch_reg.c

@@ -1,4 +1,4 @@
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdio.h>
 #include <string.h>
 #include <unicorn/unicorn.h>

samples/sample_m68k.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_mips.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_sparc.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

samples/sample_x86_32_gdt_and_seg_regs.c

@@ -20,11 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <unicorn/unicorn.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #pragma pack(push, 1)
 struct SegmentDescriptor {

samples/shellcode.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/block_test.c

@@ -1,8 +1,8 @@
 #include <sys/types.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/eflags_noset.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <assert.h>
 
 #include <unicorn/unicorn.h>

tests/regress/eflags_nosync.c

@@ -1,4 +1,4 @@
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>

tests/regress/emu_clear_errors.c

@@ -1,8 +1,8 @@
 #include <sys/types.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/emu_stop_in_hook_overrun.c

@@ -22,8 +22,8 @@ Test for uc_emu_stop() in code hook not always stopping the emu at the current i
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #include "pthread.h"
 #endif // _MSC_VER

tests/regress/hook_extrainvoke.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/invalid_read_in_cpu_tb_exec.c

@@ -1,4 +1,4 @@
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 
 static void hook_block(uc_engine *uc, uint64_t address, uint32_t size, void *user_data) {

tests/regress/mem_64_c.c

@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 
 uint64_t starts[] = {0x10000000, 0x110004000ll};

tests/regress/mem_double_unmap.c

@@ -1,7 +1,7 @@
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/mem_exec.c

@@ -19,9 +19,9 @@
  */
 
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/mem_fuzz.c

@@ -1,7 +1,7 @@
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/mem_nofree.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/mem_protect.c

@@ -19,9 +19,9 @@
  */
 
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/mem_unmap.c

@@ -20,9 +20,9 @@
  */
 
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/memleak_arm.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_arm64.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_m68k.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_mips.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_sparc.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_x86.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/mips_branch_likely_issue.c

@@ -22,8 +22,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #include "pthread.h"
 #endif // _MSC_VER

tests/regress/mips_delay_slot_code_hook.c

@@ -27,8 +27,8 @@ but that the code hook is just not occurring.
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/nr_mem_test.c

@@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/rep_movsb.c

@@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #define __STDC_FORMAT_MACROS
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/ro_mem_test.c

@@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/rw_hookstack.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 
 #define ADDRESS 0x1000000

tests/regress/threaded_emu_start.c

@@ -33,8 +33,8 @@ background.
 
 // posix specific
 #else // _MSC_VER
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 #include "pthread.h"
 #endif // _MSC_VER

tests/regress/timeout_segfault.c

@@ -9,7 +9,7 @@ call to uc_emu_start(). See issue #78 for more details:
 https://github.com/unicorn-engine/unicorn/issues/78
 */
 
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/unit/test_gdt_idt_x86.c

@@ -1,9 +1,9 @@
 #include <unicorn/unicorn.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 /**
  * Assert that err matches expect

tests/unit/test_hang.c

@@ -5,7 +5,7 @@
 
 #include "unicorn_test.h"
 #include <stdio.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 uint64_t trunc_page(uint64_t addr)
 {

tests/unit/test_hookcounts.c

@@ -4,7 +4,7 @@
 // emulation by counts of instruction code
 //
 #include "unicorn_test.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define DEBUG 1
 

tests/unit/test_mem_high.c

@@ -7,7 +7,7 @@
 #include "unicorn_test.h"
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 /* Called before every test to set up a new instance */
 static int setup(void **state)

tests/unit/test_multihook.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_pc_change.c

@@ -1,6 +1,6 @@
 // Test PC change during the callback. by Nguyen Anh Quynh, 2016
 #include "unicorn_test.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_tb_x86.c

@@ -8,7 +8,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define RIP_NEXT_TO_THE_SELFMODIFY_OPCODE (1)
 

tests/unit/test_x86.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_x86_rip_bug.c

@@ -1,5 +1,5 @@
-#include "platform.h"
-#include "platform.h"
+#include "unicorn/platform.h"
+#include "unicorn/platform.h"
 #include <unicorn/unicorn.h>
 
 #include "unicorn_test.h"

tests/unit/test_x86_shl_enter_leave.c

@@ -1,4 +1,4 @@
-#include "platform.h"
+#include "unicorn/platform.h"
 #include <string.h>
 
 #include "unicorn_test.h"

tests/unit/test_x86_soft_paging.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include "platform.h"
+#include "unicorn/platform.h"
 
 /*
     Two tests here for software paging