* include/cygwin/socket.h: Include sys/uio.h instead of cygwin/uio.h.

	* include/cygwin/uio.h: Remove.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f5db89d..eb54da9 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 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
        comment.
        * spawn.cc (spawn_guts): Call cygheap->fdtab.set_file_pointers_for_exec

diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
index 91b80dd..3111e9d 100644 (file)
--- 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 (file)
index 18c77ae..0000000
--- a/winsup/cygwin/include/cygwin/uio.h
+++ /dev/null
@@ -1 +0,0 @@
-/* uio.h */