From de6da571eeff41e69a28744b4c57e219828e26bc Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Mon, 5 Feb 2018 14:38:46 -0500 Subject: [PATCH] Remove some unnecessary redefinitions of std symbols. Two files in stdio-common were unnecessarily redefining some standard symbols as their _IO_ aliases. * stdio-common/vfprintf.c: Don't redefine FILE, va_list, or BUFSIZ. * stdio-common/tstgetln.c: Don't redefine ssize_t. --- ChangeLog | 5 +++++ stdio-common/tstgetln.c | 2 -- stdio-common/vfprintf.c | 7 +------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a9b7ca2f3..ce1ae31944 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-02-06 Zack Weinberg + + * stdio-common/tstgetln.c: Don't redefine FILE, va_list, or BUFSIZ. + * stdio-common/tstgetln.c: Don't redefine ssize_t. + 2018-02-06 Joseph Myers * sysdeps/gnu/netinet/tcp.h (TCP_FASTOPEN_KEY): New macro. diff --git a/stdio-common/tstgetln.c b/stdio-common/tstgetln.c index a18f754e35..6960e68620 100644 --- a/stdio-common/tstgetln.c +++ b/stdio-common/tstgetln.c @@ -16,8 +16,6 @@ . */ #include -#undef ssize_t -#define ssize_t _IO_ssize_t int main (int argc, char *argv[]) diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 3b87740dd9..a2cab30685 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -39,13 +39,8 @@ Beside this it is also shared between the normal and wide character implementation as defined in ISO/IEC 9899:1990/Amendment 1:1995. */ - #include -#define FILE _IO_FILE -#undef va_list -#define va_list _IO_va_list -#undef BUFSIZ -#define BUFSIZ _IO_BUFSIZ + /* In some cases we need extra space for all the output which is not counted in the width of the string. We assume 32 characters is enough. */