projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure that wint_t gets defined on IRIX 5.3.
[gnulib.git]
/
lib
/
wctype.in.h
diff --git
a/lib/wctype.in.h
b/lib/wctype.in.h
index
fc1b5c0
..
e3ed367
100644
(file)
--- a/
lib/wctype.in.h
+++ b/
lib/wctype.in.h
@@
-52,10
+52,9
@@
#ifndef _GL_WCTYPE_H
#define _GL_WCTYPE_H
#ifndef _GL_WCTYPE_H
#define _GL_WCTYPE_H
-#if @HAVE_WINT_T@
-typedef wint_t __wctype_wint_t;
-#else
-typedef int __wctype_wint_t;
+/* Define wint_t. (Also done in wchar.in.h.) */
+#if !@HAVE_WINT_T@ && !defined wint_t
+# define wint_t int
#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.
@@
-98,56
+97,56
@@
typedef int __wctype_wint_t;
# endif
static inline int
# endif
static inline int
-iswalnum (
__wctype_
wint_t wc)
+iswalnum (wint_t wc)
{
return ((wc >= '0' && wc <= '9')
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
}
static inline int
{
return ((wc >= '0' && wc <= '9')
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
}
static inline int
-iswalpha (
__wctype_
wint_t wc)
+iswalpha (wint_t wc)
{
return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
}
static inline int
{
return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
}
static inline int
-iswblank (
__wctype_
wint_t wc)
+iswblank (wint_t wc)
{
return wc == ' ' || wc == '\t';
}
static inline int
{
return wc == ' ' || wc == '\t';
}
static inline int
-iswcntrl (
__wctype_
wint_t wc)
+iswcntrl (wint_t wc)
{
return (wc & ~0x1f) == 0 || wc == 0x7f;
}
static inline int
{
return (wc & ~0x1f) == 0 || wc == 0x7f;
}
static inline int
-iswdigit (
__wctype_
wint_t wc)
+iswdigit (wint_t wc)
{
return wc >= '0' && wc <= '9';
}
static inline int
{
return wc >= '0' && wc <= '9';
}
static inline int
-iswgraph (
__wctype_
wint_t wc)
+iswgraph (wint_t wc)
{
return wc >= '!' && wc <= '~';
}
static inline int
{
return wc >= '!' && wc <= '~';
}
static inline int
-iswlower (
__wctype_
wint_t wc)
+iswlower (wint_t wc)
{
return wc >= 'a' && wc <= 'z';
}
static inline int
{
return wc >= 'a' && wc <= 'z';
}
static inline int
-iswprint (
__wctype_
wint_t wc)
+iswprint (wint_t wc)
{
return wc >= ' ' && wc <= '~';
}
static inline int
{
return wc >= ' ' && wc <= '~';
}
static inline int
-iswpunct (
__wctype_
wint_t wc)
+iswpunct (wint_t wc)
{
return (wc >= '!' && wc <= '~'
&& !((wc >= '0' && wc <= '9')
{
return (wc >= '!' && wc <= '~'
&& !((wc >= '0' && wc <= '9')
@@
-155,20
+154,20
@@
iswpunct (__wctype_wint_t wc)
}
static inline int
}
static inline int
-iswspace (
__wctype_
wint_t wc)
+iswspace (wint_t wc)
{
return (wc == ' ' || wc == '\t'
|| wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
}
static inline int
{
return (wc == ' ' || wc == '\t'
|| wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
}
static inline int
-iswupper (
__wctype_
wint_t wc)
+iswupper (wint_t wc)
{
return wc >= 'A' && wc <= 'Z';
}
static inline int
{
return wc >= 'A' && wc <= 'Z';
}
static inline int
-iswxdigit (
__wctype_
wint_t wc)
+iswxdigit (wint_t wc)
{
return ((wc >= '0' && wc <= '9')
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
{
return ((wc >= '0' && wc <= '9')
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));