[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 17/32] slirp: improve windows headers inclusion
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv2 17/32] slirp: improve windows headers inclusion |
Date: |
Tue, 5 Feb 2019 18:59:12 +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] [PULLv2 00/32] More work towards libslirp, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 03/32] slirp: Don't mark struct ipq or struct ipasfrag as packed, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 07/32] net/slirp: fix leaks on forwarding rule registration error, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 02/32] slirp: Avoid marking naturally packed structs as QEMU_PACKED, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 01/32] slirp: Avoid unaligned 16bit memory access, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 13/32] slirp: add unregister_poll_fd() callback, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 12/32] slirp: replace qemu_set_nonblock(), Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 05/32] net/slirp: simplify checking for cmd: prefix, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 06/32] net/slirp: free forwarding rules on cleanup, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 16/32] slirp: do not include qemu headers in libslirp.h public API header, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 17/32] slirp: improve windows headers inclusion,
Samuel Thibault <=
- [Qemu-devel] [PULLv2 09/32] slirp: replace trace functions with DEBUG calls, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 10/32] slirp: replace QEMU_PACKED with SLIRP_PACKED, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 21/32] slirp: replace net/eth.h inclusion with own defines, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 08/32] slirp: add callbacks for timer, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 14/32] slirp: replace qemu_notify_event() with a callback, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 19/32] slirp: remove qemu timer.h dependency, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 18/32] slirp: add slirp own version of pstrcpy, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 04/32] slirp: generalize guestfwd with a callback based approach, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 11/32] slirp: replace most qemu socket utilities with slirp own version, Samuel Thibault, 2019/02/05
- [Qemu-devel] [PULLv2 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/05