[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv4 17/32] slirp: improve windows headers inclusion
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv4 17/32] slirp: improve windows headers inclusion |
Date: |
Thu, 7 Feb 2019 16:03:01 +0200 |
From: Marc-André Lureau <address@hidden>
Our API usage requires Vista, set WIN32_LEAN_AND_MEAN to fix a number
of issues (winsock2.h include order for ex, which is better to include
first for legacy reasons).
While at it, group redundants #ifndef _WIN32 blocks.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/slirp.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 8d9d72ca9d..5a830ddcb8 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -3,10 +3,19 @@
#ifdef _WIN32
+/* as defined in sdkddkver.h */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600 /* Vista */
+#endif
+/* reduces the number of implicitly included headers */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
typedef char *caddr_t;
-# include <windows.h>
# include <winsock2.h>
+# include <windows.h>
# include <ws2tcpip.h>
# include <sys/timeb.h>
# include <iphlpapi.h>
@@ -19,19 +28,10 @@ typedef char *caddr_t;
#ifndef _WIN32
#include <sys/uio.h>
-#endif
-
-#ifndef _WIN32
#include <netinet/in.h>
#include <arpa/inet.h>
-#endif
-
-#ifndef _WIN32
#include <sys/socket.h>
-#endif
-
-#ifndef _WIN32
-# include <sys/ioctl.h>
+#include <sys/ioctl.h>
#endif
#ifdef __APPLE__
--
2.20.1
- [Qemu-devel] [PULLv4 25/32] slirp: replace remaining qemu headers dependency, (continued)
- [Qemu-devel] [PULLv4 25/32] slirp: replace remaining qemu headers dependency, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 30/32] slirp: use polling callbacks, drop glib requirement, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 22/32] slirp: replace qemu qtailq with slirp own copy, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 26/32] slirp: prefer c99 types over BSD kind, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 32/32] slirp: API is extern C, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 28/32] slirp: replace global polling with per-instance & notifier, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 12/32] slirp: replace qemu_set_nonblock(), Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 27/32] slirp: improve send_packet() callback, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 17/32] slirp: improve windows headers inclusion,
Samuel Thibault <=
- [Qemu-devel] [PULLv4 29/32] slirp: remove slirp_instances list, Samuel Thibault, 2019/02/07
- Re: [Qemu-devel] [PULLv4 00/32] More work towards libslirp, no-reply, 2019/02/07
- Re: [Qemu-devel] [PULLv4 00/32] More work towards libslirp, Peter Maydell, 2019/02/08