summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2007-12-14 12:12:32 +0000
committerCorinna Vinschen <corinna@vinschen.de>2007-12-14 12:12:32 +0000
commitb4d71b77ba0b4b7c9f1536268bab23f93e396741 (patch)
treec8b8184e572afd8fb68870bc69a46ecdc586880c
parentcce64750b25abfc19e1a9e75d6c59d3844c56f23 (diff)
downloadcygnal-b4d71b77ba0b4b7c9f1536268bab23f93e396741.tar.gz
cygnal-b4d71b77ba0b4b7c9f1536268bab23f93e396741.tar.bz2
cygnal-b4d71b77ba0b4b7c9f1536268bab23f93e396741.zip
* include/cygwin/socket.h: Include sys/uio.h instead of cygwin/uio.h.
* include/cygwin/uio.h: Remove.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/include/cygwin/socket.h2
-rw-r--r--winsup/cygwin/include/cygwin/uio.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f5db89dee..eb54da9f8 100644
--- 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 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 */