From: Stefan Weil <sw@weilnetz.de>
Date: Sun, 23 Feb 2014 17:02:07 +0000 (+0100)
Subject: util/iov: Use qemu/sockets.h instead of conditional code
X-Git-Tag: v2.0.0-rc0~42^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc99c6f5ff3fb2acfa52764a539e129cada104e4;p=thirdparty%2Fqemu.git

util/iov: Use qemu/sockets.h instead of conditional code

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/util/iov.c b/util/iov.c
index 03934da74dc..6569b5aae1c 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -17,14 +17,7 @@
  */
 
 #include "qemu/iov.h"
-
-#ifdef _WIN32
-# include <windows.h>
-# include <winsock2.h>
-#else
-# include <sys/types.h>
-# include <sys/socket.h>
-#endif
+#include "qemu/sockets.h"
 
 size_t iov_from_buf(const struct iovec *iov, unsigned int iov_cnt,
                     size_t offset, const void *buf, size_t bytes)