Use WIN32_LEAN_AND_MEAN, by Stefan Weil.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3832 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index a955cf4dc18dbf360c859e75b8d81a9cd182ae03..41ddf4a18caa40b5651bdb195e03b5a293b8b26b 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -32,7 +32,9 @@
 #define AUDIO_CAP "dsound"
 #include "audio_int.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <mmsystem.h>
 #include <objbase.h>
 #include <dsound.h>
 

diff --git a/exec.c b/exec.c
index 07d5de04ae3596883e55fec08173c82b6199d1a2..a4333dd7a4c2ab105ba2d4d3d3c34571a1e3849d 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -19,6 +19,7 @@
  */
 #include "config.h"
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #else
 #include <sys/types.h>

diff --git a/kqemu.c b/kqemu.c
index 9e2d1d627bb4bb0ef8656eaf335562387551ecaf..148a52f1cc69f5d8c1950ba2ff78f40b92ce91ce 100644 (file)
--- a/kqemu.c
+++ b/kqemu.c
@@ -19,6 +19,7 @@
  */
 #include "config.h"
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winioctl.h>
 #else

diff --git a/osdep.c b/osdep.c
index 00c19ce6e11fd751223c53d687447636665b32bd..8191b1f7179801cbb209696f2576a9a2544c0324 100644 (file)
--- a/osdep.c
+++ b/osdep.c
@@ -37,6 +37,7 @@
 #include "sysemu.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #elif defined(_BSD)
 #include <stdlib.h>

diff --git a/qemu-common.h b/qemu-common.h
index 2c955219da7b30a5c6af894cf6e6fa4394d17bb6..e8ea68735b4ded13c35f02307f0d80845700d431 100644 (file)
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -28,6 +28,7 @@
 #endif
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #define fsync _commit
 #define lseek _lseeki64

diff --git a/qemu-img.c b/qemu-img.c
index 2dffe8e3a45ea1d65732e55f7f2ab4bc0dc3739b..0857993945fed3ba9ca2f273e1fda84bb87eca0a 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -26,6 +26,7 @@
 #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 6e8bcce6cf4c5cc2842cf8b00e2f96ce6c713b58..5229c24faa90eec038868c42324a601492c04c7f 100644 (file)
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -3,7 +3,7 @@
 #define QEMU_SOCKET_H
 
 #ifdef _WIN32
-
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 1809ba73cc9efb4affd3e9580208cddb7b8c34e0..b8d756e55500c903d0790c9f5b2cd03d76e915e6 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -29,6 +29,7 @@ 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 <sys/timeb.h>

diff --git a/tap-win32.c b/tap-win32.c
index 694441eee997c1a4c4d525ebf3b20a8d4b4e1fd4..bfec14578a51c23286215d3f53c018372c60d67e 100644 (file)
--- a/tap-win32.c
+++ b/tap-win32.c
@@ -30,6 +30,7 @@
 #include "net.h"
 #include "sysemu.h"
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 /* NOTE: PCIBus is redefined in winddk.h */

diff --git a/vl.c b/vl.c
index d914cb40e24c2d1ab949b0e2cf4865177f3f05c1..e5b4e06cfe346563312de01b726d6e55aabea2b3 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -109,7 +109,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #ifdef _WIN32
 #include <malloc.h>
 #include <sys/timeb.h>
-#include <windows.h>
+#include <mmsystem.h>
 #define getopt_long_only getopt_long
 #define memalign(align, size) malloc(size)
 #endif
@@ -8966,7 +8966,7 @@ int main(int argc, char **argv)
                     s->down_script[0])
                     launch_script(s->down_script, ifname, s->fd);
             }
-    }
+        }
     }
 #endif
     return 0;