diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-02-07 19:21:54 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:13:21 -0500 |
| commit | 177aad3ff637b32550aec8080314d76a189f7a03 (patch) | |
| tree | 723dccbc1ca410f26efa1f49c741f0c188057a49 /libio/oldiopopen.c | |
| parent | 9964a14579e5eef925aaa82facc4980f627802fe (diff) | |
| download | glibc-177aad3ff637b32550aec8080314d76a189f7a03.zip glibc-177aad3ff637b32550aec8080314d76a189f7a03.tar.gz glibc-177aad3ff637b32550aec8080314d76a189f7a03.tar.bz2 | |
Remove legacy configuration knobs from libio.
This patch eliminates the "compatibility defines"
_IO_UNIFIED_JUMPTABLES (always defined to 1, used in a number of #ifs
which are therefore always false), _STDIO_USES_IOSTREAM (unused),
__HAVE_COLUMN (unused), _IO_BE (replaced with __glibc_unlikely), and
yet another redundant definition of EOF.
Installed stripped libraries are unchanged by this patch.
* libio/libio.h (_IO_UNIFIED_JUMPTABLES, _STDIO_USES_IOSTREAM)
(__HAVE_COLUMN, _IO_BE): Don't define.
(_IO_peekc_unlocked, _IO_getwc_unlocked, _IO_putwc_unlocked)
(_IO_fwide_maybe_incompatible): Use __glibc_unlikely.
* libio/libioP.h (EOF): Don't define.
* libio/iofdopen.c, libio/iofopen.c, libio/iopopen.c
* libio/iovdprintf.c, libio/oldiofdopen.c, libio/oldiofopen.c
* libio/oldiopopen.c, debug/vdprintf_chk.c: Remove #if block
testing _IO_UNIFIED_JUMPTABLES.
Diffstat (limited to 'libio/oldiopopen.c')
| -rw-r--r-- | libio/oldiopopen.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c index 42cab4e..e47965d 100644 --- a/libio/oldiopopen.c +++ b/libio/oldiopopen.c @@ -157,9 +157,6 @@ _IO_old_popen (const char *command, const char *mode) _IO_old_init (fp, 0); _IO_JUMPS_FILE_plus (&new_f->fpx.file) = &_IO_old_proc_jumps; _IO_old_file_init_internal ((struct _IO_FILE_plus *) &new_f->fpx.file); -#if !_IO_UNIFIED_JUMPTABLES - new_f->fpx.file.vtable = NULL; -#endif if (_IO_old_proc_open (fp, command, mode) != NULL) return fp; _IO_un_link ((struct _IO_FILE_plus *) &new_f->fpx.file); |