Fixed some conflicts

samples/mem_apis.c

@@ -20,27 +20,7 @@
 
 #define __STDC_FORMAT_MACROS
 
-<<<<<<< HEAD
-=======
-// windows specific includes
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
 
-// posix specific includes
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 #include <stdlib.h>

samples/sample_arm.c

@@ -3,27 +3,6 @@
 
 /* Sample code to demonstrate how to emulate ARM code */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 

samples/sample_arm64.c

@@ -3,27 +3,6 @@
 
 /* Sample code to demonstrate how to emulate ARM64 code */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 

samples/sample_batch_reg.c

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-
-=======
-#include <stdio.h>
-#include <string.h>
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 #include <stdio.h>

samples/sample_m68k.c

@@ -3,27 +3,6 @@
 
 /* Sample code to demonstrate how to emulate m68k code */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 

samples/sample_mips.c

@@ -3,27 +3,6 @@
 
 /* Sample code to demonstrate how to emulate Mips code (big endian) */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 

samples/sample_sparc.c

@@ -3,27 +3,6 @@
 
 /* Sample code to demonstrate how to emulate Sparc code */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 

samples/sample_x86_32_gdt_and_seg_regs.c

@@ -20,18 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #include <unicorn/unicorn.h>
-<<<<<<< HEAD
-=======
-#include <assert.h>
->>>>>>> unicorn-engine/msvc
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-<<<<<<< HEAD
-#
-=======
 
->>>>>>> unicorn-engine/msvc
 #pragma pack(push, 1)
 struct SegmentDescriptor {
    union {

samples/shellcode.c

@@ -3,27 +3,6 @@
 
 /* Sample code to trace code with Linux code with syscall */
 
-<<<<<<< HEAD
-=======
-// windows specific
-#ifdef _MSC_VER
-#include <io.h>
-#include <windows.h>
-#define PRIx64 "llX"
-#ifdef DYNLOAD
-#include "unicorn_dynload.h"
-#else // DYNLOAD
-#include <unicorn/unicorn.h>
-#ifdef _WIN64
-#pragma comment(lib, "unicorn_staload64.lib")
-#else // _WIN64
-#pragma comment(lib, "unicorn_staload.lib")
-#endif // _WIN64
-#endif // DYNLOAD
-
-// posix specific
-#else // _MSC_VER
->>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>