diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:16:25 +0000 |
commit | 8d59503b977070aaa4e504e8d6dcb7da3711893e (patch) | |
tree | 8272c9c2cce43afa4fe4d8d92c269a6435242661 /libio/stdio.c | |
parent | 76a7dc16fab8853ef9230447fa98c70a3619dc6d (diff) | |
parent | bcea9593527d90b9f9ff3817e3fbf0fbc3d01fa7 (diff) |
Merge commit 'refs/top-bases/t/gsync-libc-merge' into t/gsync-libc-merge
Diffstat (limited to 'libio/stdio.c')
-rw-r--r-- | libio/stdio.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libio/stdio.c b/libio/stdio.c index 6de85e88fb..1b7a1bc2e0 100644 --- a/libio/stdio.c +++ b/libio/stdio.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -30,19 +30,17 @@ #undef stdin #undef stdout #undef stderr -_IO_FILE *stdin = (FILE *) &_IO_2_1_stdin_; -_IO_FILE *stdout = (FILE *) &_IO_2_1_stdout_; -_IO_FILE *stderr = (FILE *) &_IO_2_1_stderr_; +FILE *stdin = (FILE *) &_IO_2_1_stdin_; +FILE *stdout = (FILE *) &_IO_2_1_stdout_; +FILE *stderr = (FILE *) &_IO_2_1_stderr_; #undef _IO_stdin #undef _IO_stdout #undef _IO_stderr -#ifdef _LIBC -# define AL(name) AL2 (name, _IO_##name) -# define AL2(name, al) \ +#define AL(name) AL2 (name, _IO_##name) +#define AL2(name, al) \ extern __typeof (name) al __attribute__ ((alias (#name), \ visibility ("hidden"))) AL(stdin); AL(stdout); AL(stderr); -#endif |