From b4d71b77ba0b4b7c9f1536268bab23f93e396741 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 14 Dec 2007 12:12:32 +0000
Subject: [PATCH] 	* include/cygwin/socket.h: Include sys/uio.h instead
 of cygwin/uio.h. 	* include/cygwin/uio.h: Remove.

---
 winsup/cygwin/ChangeLog               | 5 +++++
 winsup/cygwin/include/cygwin/socket.h | 2 +-
 winsup/cygwin/include/cygwin/uio.h    | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 winsup/cygwin/include/cygwin/uio.h

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f5db89dee..eb54da9f8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/socket.h: Include sys/uio.h instead of cygwin/uio.h.
+	* include/cygwin/uio.h: Remove.
+
 2007-12-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dtable.cc (dtable::set_file_pointers_for_exec): Reenable.  Fix
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index 91b80dd13..3111e9dd5 100644
--- a/winsup/cygwin/include/cygwin/socket.h
+++ b/winsup/cygwin/include/cygwin/socket.h
@@ -47,7 +47,7 @@ struct sockaddr_storage {
 
 #include <asm/socket.h>			/* arch-dependent defines	*/
 #include <cygwin/sockios.h>		/* the SIOCxxx I/O controls	*/
-#include <cygwin/uio.h>			/* iovec support		*/
+#include <sys/uio.h>			/* iovec support		*/
 #include <sys/types.h>
 
 struct ucred {
diff --git a/winsup/cygwin/include/cygwin/uio.h b/winsup/cygwin/include/cygwin/uio.h
deleted file mode 100644
index 18c77ae65..000000000
--- a/winsup/cygwin/include/cygwin/uio.h
+++ /dev/null
@@ -1 +0,0 @@
-/* uio.h */