diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-02-05 14:38:46 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-02-05 19:58:01 -0500 |
| commit | de6da571eeff41e69a28744b4c57e219828e26bc (patch) | |
| tree | 7ec277d6502791738c5145d94788bf47ec317f2f | |
| parent | c2b84df9b0207d1233b2de07b836a773889d93d8 (diff) | |
| download | glibc-de6da571eeff41e69a28744b4c57e219828e26bc.tar.gz glibc-de6da571eeff41e69a28744b4c57e219828e26bc.tar.xz glibc-de6da571eeff41e69a28744b4c57e219828e26bc.zip | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | stdio-common/tstgetln.c | 2 | ||||
| -rw-r--r-- | 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 <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 a18f754e35..6960e68620 100644 --- 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 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 <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. */ |