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 <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6330 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/qemu-common.h b/qemu-common.h
index 6ee31e0788b6981ad17b9aecb2fad58dfa774e73..db6c1a612ce9925a1e1964fc650c3de36ca78345 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -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