projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* doc/headers/assert.texi (assert.h): Document assert module use.
[gnulib.git]
/
lib
/
wctype_.h
diff --git
a/lib/wctype_.h
b/lib/wctype_.h
index
6a3c056
..
460cee2
100644
(file)
--- a/
lib/wctype_.h
+++ b/
lib/wctype_.h
@@
-26,10
+26,7
@@
* wctrans_t, and wctype_t are not yet implemented.
*/
* wctrans_t, and wctype_t are not yet implemented.
*/
-#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>.
/* 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>.
@@
-39,15
+36,29
@@
# include <stdio.h>
# include <time.h>
# include <wchar.h>
# include <stdio.h>
# include <time.h>
# include <wchar.h>
-typedef wint_t __wctype_wint_t;
-#else
-typedef int __wctype_wint_t;
#endif
#endif
+#if @HAVE_WCTYPE_H@
+# if defined __DECC && __DECC_VER >= 60000000
+# include_next <wctype.h>
+# endif
+#endif
+
+#ifndef _GL_WCTYPE_H
+#define _GL_WCTYPE_H
+
/* Include the original <wctype.h> if it exists.
BeOS 5 has the functions but no <wctype.h>. */
#if @HAVE_WCTYPE_H@
/* Include the original <wctype.h> if it exists.
BeOS 5 has the functions but no <wctype.h>. */
#if @HAVE_WCTYPE_H@
-# include @ABSOLUTE_WCTYPE_H@
+# if !(defined __DECC && __DECC_VER >= 60000000)
+# include @ABSOLUTE_WCTYPE_H@
+# endif
+#endif
+
+#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.
#endif
/* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.