fix conflicts
This commit is contained in:
@ -36,7 +36,6 @@
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <assert.h>
|
||||
#include <signal.h>
|
||||
#include "glib_compat.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
|
@ -40,7 +40,6 @@
|
||||
#define HUGETLBFS_MAGIC 0x958458f6
|
||||
|
||||
#include "unicorn/platform.h"
|
||||
|
||||
#include "config-host.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include <sys/mman.h>
|
||||
|
Reference in New Issue
Block a user