about summary refs log tree commit diff
path: root/debug
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2018-02-07 19:21:54 -0500
committerZack Weinberg <zackw@panix.com>2018-02-21 14:13:21 -0500
commit177aad3ff637b32550aec8080314d76a189f7a03 (patch)
tree723dccbc1ca410f26efa1f49c741f0c188057a49 /debug
parent9964a14579e5eef925aaa82facc4980f627802fe (diff)
downloadglibc-177aad3ff637b32550aec8080314d76a189f7a03.tar.gz
glibc-177aad3ff637b32550aec8080314d76a189f7a03.tar.xz
glibc-177aad3ff637b32550aec8080314d76a189f7a03.zip
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 'debug')
-rw-r--r--debug/vdprintf_chk.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/debug/vdprintf_chk.c b/debug/vdprintf_chk.c
index c195a7951e..bc713b4962 100644
--- a/debug/vdprintf_chk.c
+++ b/debug/vdprintf_chk.c
@@ -40,9 +40,6 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg)
   _IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps);
   _IO_JUMPS (&tmpfil) = &_IO_file_jumps;
   _IO_new_file_init_internal (&tmpfil);
-#if  !_IO_UNIFIED_JUMPTABLES
-  tmpfil.vtable = NULL;
-#endif
   if (_IO_file_attach (&tmpfil.file, d) == NULL)
     {
       _IO_un_link (&tmpfil);