[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6783] Fix windows build and clean up use of <windows.h>
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6783] Fix windows build and clean up use of <windows.h> |
Date: |
Sun, 08 Mar 2009 16:26:59 +0000 |
Revision: 6783
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6783
Author: aliguori
Date: 2009-03-08 16:26:59 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Fix windows build and clean up use of <windows.h>
We want to globally define WIN_LEAN_AND_MEAN and WINVER to particular values so
let's do it in OS_CFLAGS.
Then, we can pepper in windows.h includes where using #includes that require it.
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/block-raw-win32.c
trunk/block.c
trunk/configure
trunk/kqemu.c
trunk/net.c
trunk/osdep.c
trunk/qemu-common.h
trunk/qemu-img.c
trunk/qemu_socket.h
trunk/savevm.c
trunk/slirp/slirp.h
trunk/sysemu.h
trunk/tap-win32.c
trunk/vl.c
Modified: trunk/block-raw-win32.c
===================================================================
--- trunk/block-raw-win32.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/block-raw-win32.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -25,6 +25,7 @@
#include "qemu-timer.h"
#include "block_int.h"
#include <assert.h>
+#include <windows.h>
#include <winioctl.h>
//#define WIN32_AIO
Modified: trunk/block.c
===================================================================
--- trunk/block.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/block.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -40,6 +40,10 @@
#endif
#endif
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
#define SECTOR_BITS 9
#define SECTOR_SIZE (1 << SECTOR_BITS)
Modified: trunk/configure
===================================================================
--- trunk/configure 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/configure 2009-03-08 16:26:59 UTC (rev 6783)
@@ -590,6 +590,7 @@
oss="no"
linux_user="no"
bsd_user="no"
+ OS_CFLAGS="$OS_CFLAGS -DWIN32_LEAN_AND_MEAN -DWINVER=0x501"
fi
if test ! -x "$(which cgcc 2>/dev/null)"; then
Modified: trunk/kqemu.c
===================================================================
--- trunk/kqemu.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/kqemu.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -19,7 +19,6 @@
*/
#include "config.h"
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winioctl.h>
#else
Modified: trunk/net.c
===================================================================
--- trunk/net.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/net.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -102,6 +102,7 @@
#endif
#ifdef _WIN32
+#include <windows.h>
#include <malloc.h>
#include <sys/timeb.h>
#include <mmsystem.h>
Modified: trunk/osdep.c
===================================================================
--- trunk/osdep.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/osdep.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -37,7 +37,6 @@
#include "config-host.h"
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(HOST_BSD)
#include <stdlib.h>
Modified: trunk/qemu-common.h
===================================================================
--- trunk/qemu-common.h 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/qemu-common.h 2009-03-08 16:26:59 UTC (rev 6783)
@@ -2,12 +2,6 @@
#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 QEMU_NORETURN __attribute__ ((__noreturn__))
/* Hack around the mess dyngen-exec.h causes: We need QEMU_NORETURN in files
that
Modified: trunk/qemu-img.c
===================================================================
--- trunk/qemu-img.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/qemu-img.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -27,7 +27,6 @@
#include <assert.h>
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
Modified: trunk/qemu_socket.h
===================================================================
--- trunk/qemu_socket.h 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/qemu_socket.h 2009-03-08 16:26:59 UTC (rev 6783)
@@ -3,8 +3,6 @@
#define QEMU_SOCKET_H
#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#define WINVER 0x0501 /* needed for ipv6 bits */
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
Modified: trunk/savevm.c
===================================================================
--- trunk/savevm.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/savevm.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -71,6 +71,7 @@
#endif
#ifdef _WIN32
+#include <windows.h>
#include <malloc.h>
#include <sys/timeb.h>
#include <mmsystem.h>
Modified: trunk/slirp/slirp.h
===================================================================
--- trunk/slirp/slirp.h 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/slirp/slirp.h 2009-03-08 16:26:59 UTC (rev 6783)
@@ -29,7 +29,6 @@
typedef uint64_t u_int64_t;
typedef char *caddr_t;
-#define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <winsock2.h>
# include <ws2tcpip.h>
Modified: trunk/sysemu.h
===================================================================
--- trunk/sysemu.h 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/sysemu.h 2009-03-08 16:26:59 UTC (rev 6783)
@@ -4,6 +4,10 @@
#include "qemu-common.h"
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
/* vl.c */
extern const char *bios_name;
extern const char *bios_dir;
Modified: trunk/tap-win32.c
===================================================================
--- trunk/tap-win32.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/tap-win32.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -30,7 +30,6 @@
#include "net.h"
#include "sysemu.h"
#include <stdio.h>
-#define WIN32_LEAN_AND_MEAN
#include <windows.h>
/* NOTE: PCIBus is redefined in winddk.h */
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-03-08 15:58:00 UTC (rev 6782)
+++ trunk/vl.c 2009-03-08 16:26:59 UTC (rev 6783)
@@ -103,6 +103,7 @@
#endif
#ifdef _WIN32
+#include <windows.h>
#include <malloc.h>
#include <sys/timeb.h>
#include <mmsystem.h>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6783] Fix windows build and clean up use of <windows.h>,
Anthony Liguori <=