From 11d6fb5451edf66542a7052bb8973e42ddfb7dbf Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Fri, 3 Nov 2000 06:20:17 +0000
Subject: [PATCH] std_cctype.h: Undefine macros that conflict with function
 names defined in this file.

	* include/c/bits/std_cctype.h: Undefine macros that conflict
	with function names defined in this file.
	* include/c/bits/std_cstdio.h: Likewise.

From-SVN: r37221
---
 libstdc++-v3/ChangeLog                   |  6 ++++++
 libstdc++-v3/include/c/bits/std_cctype.h | 16 ++++++++++++++++
 libstdc++-v3/include/c/bits/std_cstdio.h | 10 ++++++++++
 3 files changed, 32 insertions(+)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 06f15b3e509..17781253f77 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov  2 23:19:20 2000  Mark P Mitchell  <mark@codesourcery.com>
+
+	* include/c/bits/std_cctype.h: Undefine macros that conflict
+	with function names defined in this file.
+	* include/c/bits/std_cstdio.h: Likewise.
+
 2000-11-02  Mark Mitchell  <mark@codesourcery.com>
 
 	* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Fix typo.
diff --git a/libstdc++-v3/include/c/bits/std_cctype.h b/libstdc++-v3/include/c/bits/std_cctype.h
index bb50610b815..0fcbb748934 100644
--- a/libstdc++-v3/include/c/bits/std_cctype.h
+++ b/libstdc++-v3/include/c/bits/std_cctype.h
@@ -41,6 +41,22 @@
 #pragma GCC system_header
 #include_next <ctype.h>
 
+// Get rid of those macros defined in <ctype.h> in lieu of real functions.
+#undef isalnum
+#undef isalpha
+#undef isblank
+#undef iscntrl
+#undef isdigit
+#undef isgraph
+#undef islower
+#undef isprint
+#undef ispunct
+#undef isspace
+#undef isupper
+#undef isxdigit
+#undef tolower
+#undef toupper
+
 namespace std
 {
   extern "C" int isalnum(int __c);
diff --git a/libstdc++-v3/include/c/bits/std_cstdio.h b/libstdc++-v3/include/c/bits/std_cstdio.h
index b5836244f2a..dc590319984 100644
--- a/libstdc++-v3/include/c/bits/std_cstdio.h
+++ b/libstdc++-v3/include/c/bits/std_cstdio.h
@@ -41,6 +41,16 @@
 #pragma GCC system_header
 #include_next <stdio.h>
 
+// Get rid of those macros defined in <stdio.h> in lieu of real functions.
+#undef clearerr
+#undef feof
+#undef ferror
+#undef fileno
+#undef getc
+#undef getchar
+#undef putc
+#undef putchar
+
 namespace std 
 {
   using ::FILE;
-- 
2.30.2