summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-19 15:06:06 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:28 +0200
commit75f527d9bf6316782cb04db3a8a69bfbf45704ca (patch)
tree0e2d0ac4abc5a87bfaa1d4182f49085431374220
parent2b836fc1d536a44282010643e438257cb599d1d0 (diff)
stdio.h: move uClibc specific parts to the common place for these changes
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.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/include/stdio.h b/include/stdio.h
index 87160c6ef..3c64a5b8c 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -494,11 +494,6 @@ extern int getc_unlocked (FILE *__stream);
libc_hidden_proto(getc_unlocked)
extern int getchar_unlocked (void);
libc_hidden_proto(getchar_unlocked)
-
-# ifdef __UCLIBC__
-/* SUSv3 allows getc_unlocked to be a macro */
-# define getc_unlocked(_fp) __GETC_UNLOCKED(_fp)
-# endif
#endif /* Use POSIX or MISC. */
#ifdef __USE_MISC
@@ -553,11 +548,6 @@ extern int fputc_unlocked (int __c, FILE *__stream);
marked with __THROW. */
extern int putc_unlocked (int __c, FILE *__stream);
extern int putchar_unlocked (int __c);
-
-# ifdef __UCLIBC__
-/* SUSv3 allows putc_unlocked to be a macro */
-# define putc_unlocked(_ch, _fp) __PUTC_UNLOCKED(_ch, _fp)
-# endif
#endif /* Use POSIX or MISC. */
@@ -909,6 +899,13 @@ extern void funlockfile (FILE *__stream) __THROW;
#define fgetc(_fp) __FGETC(_fp)
#define fputc(_ch, _fp) __FPUTC(_ch, _fp)
+#if defined __USE_POSIX || defined __USE_MISC
+/* SUSv3 allows getc_unlocked to be a macro */
+#define getc_unlocked(_fp) __GETC_UNLOCKED(_fp)
+/* SUSv3 allows putc_unlocked to be a macro */
+#define putc_unlocked(_ch, _fp) __PUTC_UNLOCKED(_ch, _fp)
+#endif
+
#ifdef __USE_MISC
#define fgetc_unlocked(_fp) __FGETC_UNLOCKED(_fp)
#define fputc_unlocked(_ch, _fp) __FPUTC_UNLOCKED(_ch, _fp)