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 /include | |
| parent | 0572433b5beb636de1a49ec6b4fdab830c38cdc5 (diff) | |
| download | glibc-37f802f86400684c8d13403958b2c598721d6360.tar.gz glibc-37f802f86400684c8d13403958b2c598721d6360.tar.xz glibc-37f802f86400684c8d13403958b2c598721d6360.zip | |
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 'include')
| -rw-r--r-- | include/bits/xopen_lim.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/bits/xopen_lim.h b/include/bits/xopen_lim.h index 2ae7cb3652..4c5e62f71b 100644 --- a/include/bits/xopen_lim.h +++ b/include/bits/xopen_lim.h @@ -29,9 +29,6 @@ #ifndef _XOPEN_LIM_H #define _XOPEN_LIM_H 1 -#define __need_IOV_MAX -#include <bits/stdio_lim.h> - /* We do not provide fixed values for ARG_MAX Maximum length of argument to the `exec' function @@ -60,10 +57,16 @@ */ -/* Maximum number of `iovec' structures that one process has available - for use with `readv' or writev'. */ +/* Maximum number of `iovec' structures that may be used in a single call + to `readv', `writev', etc. */ #define _XOPEN_IOV_MAX _POSIX_UIO_MAXIOV +#include <bits/uio_lim.h> +#ifdef __IOV_MAX +# define IOV_MAX __IOV_MAX +#else +# undef IOV_MAX +#endif /* Maximum value of `digit' in calls to the `printf' and `scanf' functions. We have no limit, so return a reasonable value. */ |