diff options
| -rw-r--r-- | block-raw-win32.c | 1 | ||||
| -rw-r--r-- | block.c | 4 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | kqemu.c | 1 | ||||
| -rw-r--r-- | net.c | 1 | ||||
| -rw-r--r-- | osdep.c | 1 | ||||
| -rw-r--r-- | qemu-common.h | 6 | ||||
| -rw-r--r-- | qemu-img.c | 1 | ||||
| -rw-r--r-- | qemu_socket.h | 2 | ||||
| -rw-r--r-- | savevm.c | 1 | ||||
| -rw-r--r-- | slirp/slirp.h | 1 | ||||
| -rw-r--r-- | sysemu.h | 4 | ||||
| -rw-r--r-- | tap-win32.c | 1 | ||||
| -rw-r--r-- | vl.c | 1 |
14 files changed, 13 insertions, 13 deletions
diff --git a/block-raw-win32.c b/block-raw-win32.c index 19fa80dd76..6387b09593 100644 --- a/block-raw-win32.c +++ b/block-raw-win32.c @@ -25,6 +25,7 @@ #include "qemu-timer.h" #include "block_int.h" #include <assert.h> +#include <windows.h> #include <winioctl.h> //#define WIN32_AIO @@ -40,6 +40,10 @@ #endif #endif +#ifdef _WIN32 +#include <windows.h> +#endif + #define SECTOR_BITS 9 #define SECTOR_SIZE (1 << SECTOR_BITS) @@ -590,6 +590,7 @@ if test "$mingw32" = "yes" ; then 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 @@ -19,7 +19,6 @@ */ #include "config.h" #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <winioctl.h> #else @@ -102,6 +102,7 @@ #endif #ifdef _WIN32 +#include <windows.h> #include <malloc.h> #include <sys/timeb.h> #include <mmsystem.h> @@ -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> diff --git a/qemu-common.h b/qemu-common.h index f8ac7e6fd6..6848b337fa 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -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 diff --git a/qemu-img.c b/qemu-img.c index d83ffe3ee9..2af695fbe6 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -27,7 +27,6 @@ #include <assert.h> #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN #include <windows.h> #endif diff --git a/qemu_socket.h b/qemu_socket.h index c8ca07ea7d..fc5b5889b7 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -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> @@ -71,6 +71,7 @@ #endif #ifdef _WIN32 +#include <windows.h> #include <malloc.h> #include <sys/timeb.h> #include <mmsystem.h> diff --git a/slirp/slirp.h b/slirp/slirp.h index 6f8a7f6022..8309fe051c 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -29,7 +29,6 @@ typedef uint32_t u_int32_t; typedef uint64_t u_int64_t; typedef char *caddr_t; -#define WIN32_LEAN_AND_MEAN # include <windows.h> # include <winsock2.h> # include <ws2tcpip.h> @@ -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; diff --git a/tap-win32.c b/tap-win32.c index 3279644236..df31fda497 100644 --- a/tap-win32.c +++ b/tap-win32.c @@ -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 */ @@ -103,6 +103,7 @@ #endif #ifdef _WIN32 +#include <windows.h> #include <malloc.h> #include <sys/timeb.h> #include <mmsystem.h> |