Browse Source

stdio.h: move __STDIO_{GETC,PUTC}_MACRO dependent part to uClibc_stdio.h

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Peter S. Mazinger 13 years ago
parent
commit
d0f6eab2e9
2 changed files with 6 additions and 7 deletions
  1. 0 7
      include/stdio.h
  2. 6 0
      libc/sysdeps/linux/common/bits/uClibc_stdio.h

+ 0 - 7
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

+ 6 - 0
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 */