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 /stdio-common | |
| 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 'stdio-common')
| -rw-r--r-- | stdio-common/stdio_lim.h.in | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/stdio-common/stdio_lim.h.in b/stdio-common/stdio_lim.h.in index 510bf008aa..5288907469 100644 --- a/stdio-common/stdio_lim.h.in +++ b/stdio-common/stdio_lim.h.in @@ -15,28 +15,25 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#if !defined _STDIO_H && !defined __need_FOPEN_MAX && !defined __need_IOV_MAX +#ifndef _BITS_STDIO_LIM_H +#define _BITS_STDIO_LIM_H 1 + +#ifndef _STDIO_H # error "Never include <bits/stdio_lim.h> directly; use <stdio.h> instead." #endif -#ifdef _STDIO_H -# define L_tmpnam @L_tmpnam@ -# define TMP_MAX @TMP_MAX@ -# define FILENAME_MAX @FILENAME_MAX@ +#define L_tmpnam @L_tmpnam@ +#define TMP_MAX @TMP_MAX@ +#define FILENAME_MAX @FILENAME_MAX@ -# ifdef __USE_POSIX -# define L_ctermid @L_ctermid@ -# if !defined __USE_XOPEN2K || defined __USE_GNU -# define L_cuserid @L_cuserid@ -# endif +#ifdef __USE_POSIX +# define L_ctermid @L_ctermid@ +# if !defined __USE_XOPEN2K || defined __USE_GNU +# define L_cuserid @L_cuserid@ # endif #endif -#if defined __need_FOPEN_MAX || defined _STDIO_H -# undef FOPEN_MAX -# define FOPEN_MAX @FOPEN_MAX@ -#endif +#undef FOPEN_MAX +#define FOPEN_MAX @FOPEN_MAX@ -#if defined __need_IOV_MAX && !defined IOV_MAX -@define_IOV_MAX@ -#endif +#endif /* bits/stdio_lim.h */ |