yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-04-28 14:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse source
This commit is contained in:
Nguyen Anh Quynh 2017-01-21 11:02:17 +08:00
parent 330e7cb87b
commit c8550b86f0
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/include/qemu-common.h
View file

@ -36,7 +36,6 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <assert.h>
#include <signal.h>
#include "glib_compat.h"
#ifdef _WIN32

1
qemu/util/oslib-posix.c
View file

@ -40,7 +40,6 @@
#define HUGETLBFS_MAGIC 0x958458f6
#include "unicorn/platform.h"
#include "config-host.h"
#include "sysemu/sysemu.h"
#include <sys/mman.h>