* m4/include_next.m4 (gl_INCLUDE_NEXT): Define and AC_SUBST

[gnulib.git] / lib / wctype_.h

diff --git a/lib/wctype_.h b/lib/wctype_.h
index 312be2d..73ce09f 100644 (file)
--- a/lib/wctype_.h
+++ b/lib/wctype_.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,112 +27,106 @@
  */
 
 #ifndef _GL_WCTYPE_H
-#define _GL_WCTYPE_H
 
-#if @HAVE_WINT_T@ - 0
+#if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.
    Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
    <wchar.h>.
-   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
-   <wchar.h>.  */
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+# include <stddef.h>
 # include <stdio.h>
 # include <time.h>
 # include <wchar.h>
-typedef wint_t __wctype_wint_t;
-#else
-typedef int __wctype_wint_t;
 #endif
 
 /* Include the original <wctype.h> if it exists.
    BeOS 5 has the functions but no <wctype.h>.  */
+/* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_WCTYPE_H@
-# include @ABSOLUTE_WCTYPE_H@
+# @INCLUDE_NEXT@ @NEXT_WCTYPE_H@
 #endif
 
-/* IRIX 5.3 has bugs: its isw* macros refer to an undefined variable
-   _ctmp_ and to <ctype.h> macros like _P.  */
-#if @HAVE_WCTYPE_CTMP_BUG@
-# include <ctype.h>
-wchar_t _ctmp_;
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
+
+#if @HAVE_WINT_T@
+typedef wint_t __wctype_wint_t;
+#else
+typedef int __wctype_wint_t;
 #endif
 
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
    Assume all 12 functions are implemented the same way, or not at all.  */
+#if ! @HAVE_ISWCNTRL@
+
+/* IRIX 5.3 has macros but no functions, its isw* macros refer to an
+   undefined variable _ctmp_ and to <ctype.h> macros like _P, and they
+   refer to system functions like _iswctype that are not in the
+   standard C library.  Rather than try to get ancient buggy
+   implementations like this to work, just disable them.  */
+#  undef iswalnum
+#  undef iswalpha
+#  undef iswblank
+#  undef iswcntrl
+#  undef iswdigit
+#  undef iswgraph
+#  undef iswlower
+#  undef iswprint
+#  undef iswpunct
+#  undef iswspace
+#  undef iswupper
+#  undef iswxdigit
 
-#if !defined iswalnum && !HAVE_ISWCNTRL
 static inline int
 iswalnum (__wctype_wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
 }
-# define iswalnum iswalnum
-#endif
 
-#if !defined iswalpha && !HAVE_ISWCNTRL
 static inline int
 iswalpha (__wctype_wint_t wc)
 {
   return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
 }
-# define iswalpha iswalpha
-#endif
 
-#if !defined iswblank && !HAVE_ISWCNTRL
 static inline int
 iswblank (__wctype_wint_t wc)
 {
   return wc == ' ' || wc == '\t';
 }
-# define iswblank iswblank
-#endif
 
-#if !defined iswcntrl && !HAVE_ISWCNTRL
 static inline int
 iswcntrl (__wctype_wint_t wc)
 {
   return (wc & ~0x1f) == 0 || wc == 0x7f;
 }
-# define iswcntrl iswcntrl
-#endif
 
-#if !defined iswdigit && !HAVE_ISWCNTRL
 static inline int
 iswdigit (__wctype_wint_t wc)
 {
   return wc >= '0' && wc <= '9';
 }
-# define iswdigit iswdigit
-#endif
 
-#if !defined iswgraph && !HAVE_ISWCNTRL
 static inline int
 iswgraph (__wctype_wint_t wc)
 {
   return wc >= '!' && wc <= '~';
 }
-# define iswgraph iswgraph
-#endif
 
-#if !defined iswlower && !HAVE_ISWCNTRL
 static inline int
 iswlower (__wctype_wint_t wc)
 {
   return wc >= 'a' && wc <= 'z';
 }
-# define iswlower iswlower
-#endif
 
-#if !defined iswprint && !HAVE_ISWCNTRL
 static inline int
 iswprint (__wctype_wint_t wc)
 {
   return wc >= ' ' && wc <= '~';
 }
-# define iswprint iswprint
-#endif
 
-#if !defined iswpunct && !HAVE_ISWCNTRL
 static inline int
 iswpunct (__wctype_wint_t wc)
 {
@@ -140,37 +134,28 @@ iswpunct (__wctype_wint_t wc)
          && !((wc >= '0' && wc <= '9')
               || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
 }
-# define iswpunct iswpunct
-#endif
 
-#if !defined iswspace && !HAVE_ISWCNTRL
 static inline int
 iswspace (__wctype_wint_t wc)
 {
   return (wc == ' ' || wc == '\t'
          || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
 }
-# define iswspace iswspace
-#endif
 
-#if !defined iswupper && !HAVE_ISWCNTRL
 static inline int
 iswupper (__wctype_wint_t wc)
 {
   return wc >= 'A' && wc <= 'Z';
 }
-# define iswupper iswupper
-#endif
 
-#if !defined iswxdigit && !HAVE_ISWCNTRL
 static inline int
 iswxdigit (__wctype_wint_t wc)
 {
   return ((wc >= '0' && wc <= '9')
          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
 }
-# define iswxdigit iswxdigit
-#endif
 
+# endif /* ! HAVE_ISWCNTRL */
 
 #endif /* _GL_WCTYPE_H */
+#endif /* _GL_WCTYPE_H */