diff options
author | tjr <tjr@FreeBSD.org> | 2002-09-28 07:43:44 +0000 |
---|---|---|
committer | tjr <tjr@FreeBSD.org> | 2002-09-28 07:43:44 +0000 |
commit | 79f7c6df9ad682ea7f68fea69447b8aa16626f89 (patch) | |
tree | fec21277845a6002b681cb3657cfe09bf6cfe40c | |
parent | 609d82aa67bce900c025f86c5e2516ecaa8de7dd (diff) | |
download | FreeBSD-src-79f7c6df9ad682ea7f68fea69447b8aa16626f89.zip FreeBSD-src-79f7c6df9ad682ea7f68fea69447b8aa16626f89.tar.gz |
Remove masking macros for getwc(), putwc(), putwchar() and getwchar().
Although there was nothing wrong with getwc() and putwc(), getwchar()
and putwchar() assumed that <stdio.h> had been included before <wchar.h>,
which is not allowed by the standard.
-rw-r--r-- | include/wchar.h | 5 | ||||
-rw-r--r-- | lib/libc/stdio/getwc.c | 4 | ||||
-rw-r--r-- | lib/libc/stdio/getwchar.c | 4 | ||||
-rw-r--r-- | lib/libc/stdio/putwc.c | 4 | ||||
-rw-r--r-- | lib/libc/stdio/putwchar.c | 4 |
5 files changed, 4 insertions, 17 deletions
diff --git a/include/wchar.h b/include/wchar.h index 6a0de5e..6a85b4d 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -186,9 +186,4 @@ size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif __END_DECLS -#define getwc(fp) fgetwc(fp) -#define getwchar() fgetwc(stdin) -#define putwc(wc, fp) fputwc((wc), (fp)) -#define putwchar(wc) fputwc((wc), stdout) - #endif /* !_WCHAR_H_ */ diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c index ac1a763..e133868 100644 --- a/lib/libc/stdio/getwc.c +++ b/lib/libc/stdio/getwc.c @@ -36,10 +36,8 @@ __FBSDID("$FreeBSD$"); /* * Synonym for fgetwc(). The only difference is that getwc(), if it is a - * macro, may evaluate `fp' more than once. Function call overhead is not - * an issue here: wchar.h #define's getwc to fgetwc. + * macro, may evaluate `fp' more than once. */ -#undef getwc wint_t getwc(FILE *fp) { diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c index 25c15b0..491ff9b 100644 --- a/lib/libc/stdio/getwchar.c +++ b/lib/libc/stdio/getwchar.c @@ -35,10 +35,8 @@ __FBSDID("$FreeBSD$"); #include "local.h" /* - * Synonym for fgetwc(stdin). Function call overhead is not an issue here: - * wchar.h #define's getwchar() to fgetwc(stdin). + * Synonym for fgetwc(stdin). */ -#undef getwchar wint_t getwchar(void) { diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c index 1607fd8..e26102a 100644 --- a/lib/libc/stdio/putwc.c +++ b/lib/libc/stdio/putwc.c @@ -36,10 +36,8 @@ __FBSDID("$FreeBSD$"); /* * Synonym for fputwc(). The only difference is that putwc(), if it is a - * macro, may evaluate `fp' more than once. Function call overhead is not - * an issue here: wchar.h #define's putwc to fputwc. + * macro, may evaluate `fp' more than once. */ -#undef putwc wint_t putwc(wchar_t wc, FILE *fp) { diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c index 35ae489..569ab92 100644 --- a/lib/libc/stdio/putwchar.c +++ b/lib/libc/stdio/putwchar.c @@ -35,10 +35,8 @@ __FBSDID("$FreeBSD$"); #include "local.h" /* - * Synonym for fputwc(wc, stdout). Function call overhead is not an issue here: - * wchar.h #define's putwchar(wc) to fgetwc(wc, stdout). + * Synonym for fputwc(wc, stdout). */ -#undef putwchar wint_t putwchar(wchar_t wc) { |