From 981a89e8573b0dcc2d75f0e49780fbba760dfd1c Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Sat, 19 Mar 2011 16:01:04 +0100 Subject: [PATCH 124/396] stdio.h: move __STDIO_{GETC,PUTC}_MACRO dependent part to uClibc_stdio.h Signed-off-by: Peter S. Mazinger --- include/stdio.h | 7 ------- libc/sysdeps/linux/common/bits/uClibc_stdio.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/stdio.h b/include/stdio.h index 3c64a5b..69c1603 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -911,14 +911,7 @@ extern void funlockfile (FILE *__stream) __THROW; #define fputc_unlocked(_ch, _fp) __FPUTC_UNLOCKED(_ch, _fp) #endif -#ifndef __STDIO_GETC_MACRO -#define __stdin stdin -#endif #define getchar() __GETC(__stdin) - -#ifndef __STDIO_PUTC_MACRO -#define __stdout stdout -#endif #define putchar(_ch) __PUTC((_ch), __stdout) #if defined __USE_POSIX || defined __USE_MISC diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h index d5a522a..db28ff7 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h +++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h @@ -470,6 +470,8 @@ extern FILE *__stdin; /* For getchar() macro. */ #else +# define __stdin stdin + #endif /* __STDIO_GETC_MACRO */ @@ -529,4 +531,8 @@ extern FILE *__stdout; /* For putchar() macro. */ # endif # endif +#else + +# define __stdout stdout + #endif /* __STDIO_PUTC_MACRO */ -- 1.7.0.4