Merging with current msvc.

samples/mem_apis.c

@@ -20,6 +20,27 @@
 
 #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>