From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LNZwG-0005Gv-16
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 16:39:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LNZwF-0005GU-CB
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 16:39:43 -0500
Received: from [199.232.76.173] (port=37446 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LNZwF-0005GP-66
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 16:39:43 -0500
Received: from savannah.gnu.org ([199.232.41.3]:36278 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LNZwE-0000MW-SU
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 16:39:43 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LNZwE-0007s9-8X
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 21:39:42 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LNZwE-0007s4-0s
	for qemu-devel@nongnu.org; Thu, 15 Jan 2009 21:39:42 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LNZwE-0007s4-0s@cvs.savannah.gnu.org>
Date: Thu, 15 Jan 2009 21:39:42 +0000
Subject: [Qemu-devel] [6330] Fix Windows build (Herv?\195?\169 Poussineau)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6330
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6330
Author:   aliguori
Date:     2009-01-15 21:39:41 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
Fix Windows build (Herv?\195?\169 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?\195?\169 Poussineau <hpoussin@reactos.org> 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/qemu-common.h

Modified: trunk/qemu-common.h
===================================================================
--- trunk/qemu-common.h	2009-01-15 21:24:24 UTC (rev 6329)
+++ trunk/qemu-common.h	2009-01-15 21:39:41 UTC (rev 6330)
@@ -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