Commit 4fddf62a authored by ths's avatar ths

Use WIN32_LEAN_AND_MEAN, by Stefan Weil.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3832 c046a42c-6fe2-441c-8c8c-71466251a162
parent f60d39bc
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
#define AUDIO_CAP "dsound" #define AUDIO_CAP "dsound"
#include "audio_int.h" #include "audio_int.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <mmsystem.h>
#include <objbase.h> #include <objbase.h>
#include <dsound.h> #include <dsound.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include "config.h" #include "config.h"
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#else #else
#include <sys/types.h> #include <sys/types.h>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
*/ */
#include "config.h" #include "config.h"
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winioctl.h> #include <winioctl.h>
#else #else
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "sysemu.h" #include "sysemu.h"
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#elif defined(_BSD) #elif defined(_BSD)
#include <stdlib.h> #include <stdlib.h>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#define fsync _commit #define fsync _commit
#define lseek _lseeki64 #define lseek _lseeki64
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <assert.h> #include <assert.h>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#define QEMU_SOCKET_H #define QEMU_SOCKET_H
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
......
...@@ -29,6 +29,7 @@ typedef uint32_t u_int32_t; ...@@ -29,6 +29,7 @@ typedef uint32_t u_int32_t;
typedef uint64_t u_int64_t; typedef uint64_t u_int64_t;
typedef char *caddr_t; typedef char *caddr_t;
#define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <winsock2.h> # include <winsock2.h>
# include <sys/timeb.h> # include <sys/timeb.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "net.h" #include "net.h"
#include "sysemu.h" #include "sysemu.h"
#include <stdio.h> #include <stdio.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
/* NOTE: PCIBus is redefined in winddk.h */ /* NOTE: PCIBus is redefined in winddk.h */
......
...@@ -109,7 +109,7 @@ int inet_aton(const char *cp, struct in_addr *ia); ...@@ -109,7 +109,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
#ifdef _WIN32 #ifdef _WIN32
#include <malloc.h> #include <malloc.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#include <windows.h> #include <mmsystem.h>
#define getopt_long_only getopt_long #define getopt_long_only getopt_long
#define memalign(align, size) malloc(size) #define memalign(align, size) malloc(size)
#endif #endif
...@@ -8966,7 +8966,7 @@ int main(int argc, char **argv) ...@@ -8966,7 +8966,7 @@ int main(int argc, char **argv)
s->down_script[0]) s->down_script[0])
launch_script(s->down_script, ifname, s->fd); launch_script(s->down_script, ifname, s->fd);
} }
} }
} }
#endif #endif
return 0; return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment