X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2Finclude%2Fc_std%2Fstd_cwctype.h;h=86d0dfdab15628881bbcf15d736361d13573385d;hp=f7639ed38430272f55352a886da6dfd3ef70b8bd;hb=c586733cf4a83b317b94681d368cd3231021ab7e;hpb=5a64d8cf37253f8227d179a52a0c022a927db8b6;ds=sidebyside

diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index f7639ed3843..86d0dfdab15 100644
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- forwarding header.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CWCTYPE
-#define _CWCTYPE 1
+#ifndef _GLIBCXX_CWCTYPE
+#define _GLIBCXX_CWCTYPE 1
 
 #pragma GCC system_header
 
@@ -55,52 +55,54 @@
 // Get rid of those macros defined in <wctype.h> in lieu of real functions.
 #undef iswalnum
 #undef iswalpha
-#undef iswblank
+#if _GLIBCXX_HAVE_ISWBLANK
+# undef iswblank
+#endif
 #undef iswcntrl
+#undef iswctype
 #undef iswdigit
 #undef iswgraph
 #undef iswlower
 #undef iswprint
-#undef iswprint
 #undef iswpunct
 #undef iswspace
 #undef iswupper
 #undef iswxdigit
-#undef iswctype  
+#undef towctrans
 #undef towlower
 #undef towupper
-#undef towctrans
 #undef wctrans
 #undef wctype
 
 #if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
-  using ::wint_t; 	  // cwchar
+  using ::wint_t;	  // cwchar
 
   using ::wctype_t;
   using ::wctrans_t;
 
   using ::iswalnum;
   using ::iswalpha;
+#if _GLIBCXX_HAVE_ISWBLANK
   using ::iswblank;
+#endif
   using ::iswcntrl;
+  using ::iswctype;
   using ::iswdigit;
   using ::iswgraph;
   using ::iswlower;
   using ::iswprint;
-  using ::iswprint;
   using ::iswpunct;
   using ::iswspace;
   using ::iswupper;
   using ::iswxdigit;
-  using ::iswctype;
+  using ::towctrans;
   using ::towlower;
   using ::towupper;
-  using ::towctrans;
   using ::wctrans;
   using ::wctype;
 }
 #endif //_GLIBCXX_USE_WCHAR_T
 
-#endif 
+#endif