mirror of https://github.com/xemu-project/xemu.git
Fix Windows build (Hervé Poussineau)
r6303 broke Windows build, where "noreturn" is a keyword used with __declspec. Attached patch fixes Windows build, by moving windows.h header inclusion before Qemu noreturn define. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6330 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
da07cf59b0
commit
02082dc9ec
|
@ -2,6 +2,12 @@
|
|||
#ifndef QEMU_COMMON_H
|
||||
#define QEMU_COMMON_H
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0501 /* needed for ipv6 bits */
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#define noreturn __attribute__ ((__noreturn__))
|
||||
|
||||
/* Hack around the mess dyngen-exec.h causes: We need noreturn in files that
|
||||
|
@ -47,9 +53,6 @@ struct iovec {
|
|||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define WINVER 0x0501 /* needed for ipv6 bits */
|
||||
#include <windows.h>
|
||||
#define fsync _commit
|
||||
#define lseek _lseeki64
|
||||
#define ENOTSUP 4096
|
||||
|
|
Loading…
Reference in New Issue