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.

diff --git a/ChangeLog b/ChangeLog
index 1a9b7ca2f3807cf953b4b38f750048251db7abc6..ce1ae319440b329a7ebf59f7bb9cdf7e9d4aba11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-06  Zack Weinberg  <zackw@panix.com>
+
+       * 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  <joseph@codesourcery.com>
 
        * sysdeps/gnu/netinet/tcp.h (TCP_FASTOPEN_KEY): New macro.

diff --git a/stdio-common/tstgetln.c b/stdio-common/tstgetln.c
index a18f754e35416f61c2bb0db7be87bdd5cbbfbc50..6960e68620062a361fe080dd2a279d1b83721e04 100644 (file)
--- a/stdio-common/tstgetln.c
+++ b/stdio-common/tstgetln.c
@@ -16,8 +16,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
-#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 3b87740dd990f2ab6875d5efd5e1b7be2cf62a51..a2cab30685517b214383b22b89520c2b4f055ef4 100644 (file)
--- 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 <libioP.h>
-#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.  */