Merging with current msvc.

2017-01-23 01:07:06 +11:00
parent 72a497bc14 206819bd98
commit e46f86c80b
64 changed files with 279 additions and 801 deletions
--- a/samples/sample_x86_32_gdt_and_seg_regs.c
+++ b/samples/sample_x86_32_gdt_and_seg_regs.c
@ -20,10 +20,18 @@ 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 {