Fix Windows build
PATCH 1/1 Fix Windows build
Hi,
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 <[email protected]>
Hervé
qemu-common.h +6 -3
@@ -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 @@#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
Anthony Liguori
AppliedQuoted 6 lines · Hervé Poussineau
Hi,
r6303 broke Windows build, where "noreturn" is a keyword used with
__declspec. Attached patch fixes Windows build, by movingwindows.hheader inclusion before Qemu noreturn define.Signed-off-by Hervé Poussineau <[email protected]>
Applied. Thanks.
There are CRs in the patch. Please watch out for that in the future.
Regards,
Anthony Liguori
Quoted 1 line
Hervé