From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CnTDo-0002Bl-8E
	for qemu-devel@nongnu.org; Sat, 08 Jan 2005 21:54:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CnTAZ-0001Wq-DP
	for qemu-devel@nongnu.org; Sat, 08 Jan 2005 21:51:12 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CnTAT-0001P6-NF
	for qemu-devel@nongnu.org; Sat, 08 Jan 2005 21:51:01 -0500
Received: from [195.250.128.83] (helo=smtp3.vol.cz)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CnSm1-0000am-9i
	for qemu-devel@nongnu.org; Sat, 08 Jan 2005 21:25:45 -0500
Received: from [10.0.0.2] (prg-v-6-220.static.adsl.vol.cz [62.177.70.220])
	by smtp3.vol.cz (8.12.9p2/8.12.9) with ESMTP id j092PgIV090903
	for <qemu-devel@nongnu.org>; Sun, 9 Jan 2005 03:25:42 +0100 (CET)
	(envelope-from xnavara@volny.cz)
Message-ID: <41E09627.1020802@volny.cz>
Date: Sun, 09 Jan 2005 03:25:43 +0100
From: Filip Navara <xnavara@volny.cz>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------070502030005070203050906"
Subject: [Qemu-devel] [PATCH] Win32 build
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

This is a multi-part message in MIME format.
--------------070502030005070203050906
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Changes:
- Add x86_64-softmmu target to the build.
- Fix compiling with newer w32api headers.


--------------070502030005070203050906
Content-Type: text/plain;
 name="qemu-x64-win32.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="qemu-x64-win32.patch"

Index: configure
===================================================================
RCS file: /cvsroot/qemu/qemu/configure,v
retrieving revision 1.50
diff -u -r1.50 configure
--- configure	3 Jan 2005 23:38:40 -0000	1.50
+++ configure	9 Jan 2005 01:59:41 -0000
@@ -181,7 +181,7 @@
 strip="${cross_prefix}${strip}"
 
 if test "$mingw32" = "yes" ; then
-    target_list="i386-softmmu ppc-softmmu sparc-softmmu"
+    target_list="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu"
     EXESUF=".exe"
     gdbstub="no"
     oss="no"
Index: slirp/slirp.h
===================================================================
RCS file: /cvsroot/qemu/qemu/slirp/slirp.h,v
retrieving revision 1.9
diff -u -r1.9 slirp.h
--- slirp/slirp.h	14 Nov 2004 18:58:04 -0000	1.9
+++ slirp/slirp.h	9 Jan 2005 01:54:47 -0000
@@ -20,6 +20,7 @@
 typedef uint64_t u_int64_t;
 typedef char *caddr_t;
 
+# include <windows.h>
 # include <winsock2.h>
 # include <sys/timeb.h>
 # include <iphlpapi.h>
Index: target-i386/ops_template.h
===================================================================
RCS file: /cvsroot/qemu/qemu/target-i386/ops_template.h,v
retrieving revision 1.8
diff -u -r1.8 ops_template.h
--- target-i386/ops_template.h	3 Jan 2005 23:50:08 -0000	1.8
+++ target-i386/ops_template.h	9 Jan 2005 02:18:37 -0000
@@ -46,7 +46,7 @@
 #define SUFFIX q
 #define DATA_TYPE uint64_t
 #define DATA_STYPE int64_t
-#define DATA_MASK 0xffffffffffffffff
+#define DATA_MASK 0xffffffffffffffffULL
 #else
 #error unhandled operand size
 #endif

--------------070502030005070203050906--