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.

4 files changed, 4 insertions, 12 deletions

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)
 {