This code should now build the x86_x64-softmmu part 2.

tests/regress/block_test.c

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

tests/regress/eflags_noset.c

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

tests/regress/eflags_nosync.c

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

tests/regress/emu_clear_errors.c

@@ -1,9 +1,8 @@
 #include <sys/types.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include "platform.h"
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+#include "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 <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "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 <stdint.h>
+#include "platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/invalid_read_in_cpu_tb_exec.c

@@ -1,4 +1,4 @@
-#include <inttypes.h>
+#include "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 <inttypes.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "platform.h"
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

tests/regress/mem_nofree.c

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

tests/regress/mem_protect.c

@@ -19,9 +19,9 @@
  */
 
 #define __STDC_FORMAT_MACROS
-#include <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "platform.h"
 #include <unicorn/unicorn.h>
 #endif // _MSC_VER
 

tests/regress/memleak_arm64.c

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

tests/regress/memleak_m68k.c

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

tests/regress/memleak_mips.c

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

tests/regress/memleak_sparc.c

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

tests/regress/memleak_x86.c

@@ -21,8 +21,8 @@
 
 // posix specific
 #else // _MSC_VER
-#include <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "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 <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "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 <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 #include <string.h>
-#include <unistd.h>
+#include "platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/regress/rw_hookstack.c

@@ -1,8 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <inttypes.h>
+#include "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 <unistd.h>
-#include <inttypes.h>
+#include "platform.h"
+#include "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 <inttypes.h>
+#include "platform.h"
 
 #include <unicorn/unicorn.h>
 

tests/unit/test_gdt_idt_x86.c

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

tests/unit/test_hang.c

@@ -5,7 +5,7 @@
 
 #include "unicorn_test.h"
 #include <stdio.h>
-#include <inttypes.h>
+#include "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 <inttypes.h>
+#include "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 <inttypes.h>
+#include "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 <inttypes.h>
+#include "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 <inttypes.h>
+#include "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 <inttypes.h>
+#include "platform.h"
 
 #define RIP_NEXT_TO_THE_SELFMODIFY_OPCODE (1)
 

tests/unit/test_x86.c

@@ -1,5 +1,5 @@
 #include "unicorn_test.h"
-#include <inttypes.h>
+#include "platform.h"
 
 #define OK(x)   uc_assert_success(x)
 

tests/unit/test_x86_rip_bug.c

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

tests/unit/test_x86_shl_enter_leave.c

@@ -1,6 +1,5 @@
-#include <stdint.h>
+#include "platform.h"
 #include <string.h>
-#include <inttypes.h>
 
 #include "unicorn_test.h"
 

tests/unit/test_x86_soft_paging.c

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