diff options
| author | Zack Weinberg <zackw@panix.com> | 2017-03-22 10:55:38 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2017-06-14 07:51:30 -0400 |
| commit | 37f802f86400684c8d13403958b2c598721d6360 (patch) | |
| tree | 1e7281fbdff02e8e0818300cf0ac1d496956d1a9 /misc | |
| parent | 0572433b5beb636de1a49ec6b4fdab830c38cdc5 (diff) | |
Remove __need_IOV_MAX and __need_FOPEN_MAX.
__need_FOPEN_MAX wasn't being used anywhere. __need_IOV_MAX was more
complicated; the basic deal is that sys/uio.h wants to define a
constant named UIO_MAXIOV and bits/xopen_lim.h wants to define a
constant named IOV_MAX, with the same meaning. For no apparent reason
this was being handled via bits/stdio_lim.h -- stdio.h is NOT supposed
to define IOV_MAX -- and some mess in Makerules. Also, bits/uio.h on
Linux was being used as a dumping ground for extension functions.
So now we have bits/uio_lim.h, which defines __IOV_MAX.
bits/xopen_lim.h and sys/uio.h use that to define their respective
constants. We also now have bits/uio-ext.h, which is the official
Proper Home for extensions to sys/uio.h. bits/uio.h is removed, and
stdio_lim.h doesn't define IOV_MAX at all.
* bits/uio_lim.h, sysdeps/unix/sysv/linux/bits/uio_lim.h
* bits/uio-ext.h, sysdeps/unix/sysv/linux/bits/uio-ext.h: New file.
* bits/uio.h, sysdeps/unix/sysv/linux/bits/uio.h: Delete file.
* include/bits/xopen_lim.h: Use bits/uio_lim.h to get the value
for IOV_MAX.
* misc/Makefile: Install bits/uio-ext.h and bits/uio_lim.h.
Don't install bits/uio.h.
* misc/sys/uio.h: Don't include bits/uio.h. Do include
bits/types/struct_iovec.h and bits/uio_lim.h. Set UIO_MAXIOV
based on __IOV_MAX. Under __USE_GNU, also include bits/uio-ext.h.
* stdio-common/stdio_lim.h.in: Remove logic for __need_FOPEN_MAX
and __need_IOV_MAX. Don't define IOV_MAX at all.
* Makerules (stdio_lim.h): Remove logic for setting IOV_MAX.
* sysdeps/unix/sysv/linux/bits/fcntl-linux.h:
Include bits/types/struct_iovec.h, not bits/uio.h.
Use __ssize_t, not ssize_t, in function prototypes.
Don't use hard TAB for double space after period in comments.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile | 3 | ||||
| -rw-r--r-- | misc/sys/uio.h | 18 |
2 files changed, 15 insertions, 6 deletions
diff --git a/misc/Makefile b/misc/Makefile index 46072e62d9..8660b6fc74 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -23,7 +23,8 @@ subdir := misc include ../Makeconfig -headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ +headers := sys/uio.h bits/uio-ext.h bits/uio_lim.h \ + sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \ ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \ ttyent.h paths.h sys/reboot.h \ diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 66c22f04f6..2ae918a8d4 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -19,15 +19,17 @@ #define _SYS_UIO_H 1 #include <features.h> - #include <sys/types.h> +#include <bits/types/struct_iovec.h> +#include <bits/uio_lim.h> +#ifdef __IOV_MAX +# define UIO_MAXIOV __IOV_MAX +#else +# undef UIO_MAXIOV +#endif __BEGIN_DECLS -/* This file defines `struct iovec'. */ -#include <bits/uio.h> - - /* Read data from file descriptor FD, and put the result in the buffers described by IOVEC, which is a vector of COUNT 'struct iovec's. The buffers are filled in the order specified. @@ -160,4 +162,10 @@ extern ssize_t pwritev64v2 (int __fd, const struct iovec *__iodev, __END_DECLS +/* Some operating systems provide system-specific extensions to this + header. */ +#ifdef __USE_GNU +# include <bits/uio-ext.h> +#endif + #endif /* sys/uio.h */ |