aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--bits/uio.h10
-rw-r--r--conform/Makefile4
-rw-r--r--include/bits/types/struct_iovec.h1
-rw-r--r--misc/Makefile2
-rw-r--r--misc/bits/types/struct_iovec.h32
-rw-r--r--nptl/tst-cancel4.c1
-rw-r--r--posix/test-errno.c1
-rw-r--r--socket/sys/socket.h2
-rw-r--r--support/resolv_test.c1
-rw-r--r--sysdeps/unix/sysv/linux/bits/uio.h7
11 files changed, 58 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 90ddfe0eae..8867578f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2017-04-25 Joseph Myers <joseph@codesourcery.com>
+ [BZ #21426]
+ * misc/bits/types/struct_iovec.h: New file.
+ * misc/Makefile (headers): Add bits/types/struct_iovec.h.
+ * include/bits/types/struct_iovec.h: New file.
+ * bits/uio.h (struct iovec): Replace by inclusion of
+ <bits/types/struct_iovec.h>.
+ * sysdeps/unix/sysv/linux/bits/uio.h (struct iovec): Likewise.
+ * socket/sys/socket.h: Include <bits/types/struct_iovec.h> instead
+ of <sys/uio.h>.
+ * nptl/tst-cancel4.c: Include <sys/uio.h>
+ * posix/test-errno.c: Likewise.
+ * support/resolv_test.c: Likewise.
+ * conform/Makefile (test-xfail-POSIX2008/arpa/inet.h/conform):
+ Remove.
+ (test-xfail-POSIX2008/netdb.h/conform): Likewise.
+ (test-xfail-POSIX2008/netinet/in.h/conform): Likewise.
+ (test-xfail-POSIX2008/sys/socket.h/conform): Likewise.
+
* conform/data/sys/socket.h-data (*_t): Allow.
2017-04-24 Adhemerval Zanella <adhemerval.zanella@linaro.org>
diff --git a/bits/uio.h b/bits/uio.h
index def26dfbb6..96a3a71d42 100644
--- a/bits/uio.h
+++ b/bits/uio.h
@@ -20,12 +20,4 @@
#endif
-/* `struct iovec' -- Structure describing a section of memory. */
-
-struct iovec
-{
- /* Starting address. */
- __ptr_t iov_base;
- /* Length in bytes. */
- size_t iov_len;
-};
+#include <bits/types/struct_iovec.h>
diff --git a/conform/Makefile b/conform/Makefile
index 9638ddaa5a..19404fdaf8 100644
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -180,11 +180,7 @@ test-xfail-XOPEN2K/semaphore.h/conform = yes
test-xfail-XOPEN2K/signal.h/conform = yes
test-xfail-XOPEN2K/sys/wait.h/conform = yes
test-xfail-XOPEN2K/ucontext.h/conform = yes
-test-xfail-POSIX2008/arpa/inet.h/conform = yes
-test-xfail-POSIX2008/netdb.h/conform = yes
-test-xfail-POSIX2008/netinet/in.h/conform = yes
test-xfail-POSIX2008/signal.h/conform = yes
-test-xfail-POSIX2008/sys/socket.h/conform = yes
test-xfail-POSIX2008/sys/wait.h/conform = yes
test-xfail-XOPEN2K8/signal.h/conform = yes
test-xfail-XOPEN2K8/sys/wait.h/conform = yes
diff --git a/include/bits/types/struct_iovec.h b/include/bits/types/struct_iovec.h
new file mode 100644
index 0000000000..116a247ef8
--- /dev/null
+++ b/include/bits/types/struct_iovec.h
@@ -0,0 +1 @@
+#include "../../misc/bits/types/struct_iovec.h"
diff --git a/misc/Makefile b/misc/Makefile
index ed988c3967..622da67677 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -35,7 +35,7 @@ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
syslog.h sys/syslog.h \
bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
bits/select2.h bits/hwcap.h sys/auxv.h \
- sys/sysmacros.h bits/sysmacros.h
+ sys/sysmacros.h bits/sysmacros.h bits/types/struct_iovec.h
routines := brk sbrk sstk ioctl \
readv writev preadv preadv64 pwritev pwritev64 \
diff --git a/misc/bits/types/struct_iovec.h b/misc/bits/types/struct_iovec.h
new file mode 100644
index 0000000000..bd625a302f
--- /dev/null
+++ b/misc/bits/types/struct_iovec.h
@@ -0,0 +1,32 @@
+/* Define struct iovec.
+ Copyright (C) 1996-2017 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef __iovec_defined
+#define __iovec_defined 1
+
+#define __need_size_t
+#include <stddef.h>
+
+/* Structure for scatter/gather I/O. */
+struct iovec
+ {
+ void *iov_base; /* Pointer to data. */
+ size_t iov_len; /* Length of data. */
+ };
+
+#endif
diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c
index a68a3efb68..590ce0ab5d 100644
--- a/nptl/tst-cancel4.c
+++ b/nptl/tst-cancel4.c
@@ -38,6 +38,7 @@
#include <sys/poll.h>
#include <sys/wait.h>
#include <sys/stat.h>
+#include <sys/uio.h>
/* Since STREAMS are not supported in the standard Linux kernel and
diff --git a/posix/test-errno.c b/posix/test-errno.c
index c2bfd8a80f..6aa297f837 100644
--- a/posix/test-errno.c
+++ b/posix/test-errno.c
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/statfs.h>
#include <sys/mman.h>
+#include <sys/uio.h>
#include <unistd.h>
#include <netinet/in.h>
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index 609a08d756..7af41097bb 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -23,7 +23,7 @@
__BEGIN_DECLS
-#include <sys/uio.h>
+#include <bits/types/struct_iovec.h>
#define __need_size_t
#include <stddef.h>
#ifdef __USE_GNU
diff --git a/support/resolv_test.c b/support/resolv_test.c
index 5c5a46353d..050cd7154b 100644
--- a/support/resolv_test.c
+++ b/support/resolv_test.c
@@ -33,6 +33,7 @@
#include <support/xsocket.h>
#include <support/xthread.h>
#include <support/xunistd.h>
+#include <sys/uio.h>
#include <unistd.h>
/* Response builder. */
diff --git a/sysdeps/unix/sysv/linux/bits/uio.h b/sysdeps/unix/sysv/linux/bits/uio.h
index 065a5d500a..1583f0455b 100644
--- a/sysdeps/unix/sysv/linux/bits/uio.h
+++ b/sysdeps/unix/sysv/linux/bits/uio.h
@@ -39,12 +39,7 @@
#define UIO_MAXIOV 1024
-/* Structure for scatter/gather I/O. */
-struct iovec
- {
- void *iov_base; /* Pointer to data. */
- size_t iov_len; /* Length of data. */
- };
+#include <bits/types/struct_iovec.h>
#endif