diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-19 16:01:04 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:29 +0200 |
| commit | d0f6eab2e92aa83dbe3e167d9e915d5c094dcd35 (patch) | |
| tree | 9d22e089e6c4617d2536b6afb0154f19b8637a54 | |
| parent | e941c481e708afac23851eaaf55ad6f06fd996ab (diff) | |
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>
| -rw-r--r-- | include/stdio.h | 7 | ||||
| -rw-r--r-- | 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 3c64a5b8c..69c16031f 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 d5a522a59..db28ff763 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 */ |