projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: update copyright
[gnulib.git]
/
lib
/
wctype.in.h
diff --git
a/lib/wctype.in.h
b/lib/wctype.in.h
index
641e991
..
b8ecca4
100644
(file)
--- a/
lib/wctype.in.h
+++ b/
lib/wctype.in.h
@@
-1,6
+1,6
@@
/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
/* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
- Copyright (C) 2006-201
1
Free Software Foundation, Inc.
+ Copyright (C) 2006-201
4
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
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
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Written by Bruno Haible and Paul Eggert. */
/* Written by Bruno Haible and Paul Eggert. */
@@
-45,6
+44,13
@@
# include <wchar.h>
#endif
# include <wchar.h>
#endif
+/* mingw has declarations of towupper and towlower in <ctype.h> as
+ well <wctype.h>. Include <ctype.h> in advance to avoid rpl_ prefix
+ being added to the declarations. */
+#ifdef __MINGW32__
+# include <ctype.h>
+#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. */
/* 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. */
@@
-55,6
+61,14
@@
#ifndef _@GUARD_PREFIX@_WCTYPE_H
#define _@GUARD_PREFIX@_WCTYPE_H
#ifndef _@GUARD_PREFIX@_WCTYPE_H
#define _@GUARD_PREFIX@_WCTYPE_H
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
+#endif
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_WCTYPE_INLINE
+# define _GL_WCTYPE_INLINE _GL_INLINE
+#endif
+
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_WARN_ON_USE is copied here. */
@@
-149,7
+163,7
@@
typedef unsigned int rpl_wint_t;
# endif
# endif
# endif
# endif
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswalnum
# else
# if @REPLACE_ISWCNTRL@
rpl_iswalnum
# else
@@
-161,7
+175,7
@@
iswalnum
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
}
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'));
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswalpha
# else
# if @REPLACE_ISWCNTRL@
rpl_iswalpha
# else
@@
-172,7
+186,7
@@
iswalpha
return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
}
return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswblank
# else
# if @REPLACE_ISWCNTRL@
rpl_iswblank
# else
@@
-183,7
+197,7
@@
iswblank
return wc == ' ' || wc == '\t';
}
return wc == ' ' || wc == '\t';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswcntrl
# else
# if @REPLACE_ISWCNTRL@
rpl_iswcntrl
# else
@@
-194,7
+208,7
@@
iswcntrl
return (wc & ~0x1f) == 0 || wc == 0x7f;
}
return (wc & ~0x1f) == 0 || wc == 0x7f;
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswdigit
# else
# if @REPLACE_ISWCNTRL@
rpl_iswdigit
# else
@@
-205,7
+219,7
@@
iswdigit
return wc >= '0' && wc <= '9';
}
return wc >= '0' && wc <= '9';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswgraph
# else
# if @REPLACE_ISWCNTRL@
rpl_iswgraph
# else
@@
-216,7
+230,7
@@
iswgraph
return wc >= '!' && wc <= '~';
}
return wc >= '!' && wc <= '~';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswlower
# else
# if @REPLACE_ISWCNTRL@
rpl_iswlower
# else
@@
-227,7
+241,7
@@
iswlower
return wc >= 'a' && wc <= 'z';
}
return wc >= 'a' && wc <= 'z';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswprint
# else
# if @REPLACE_ISWCNTRL@
rpl_iswprint
# else
@@
-238,7
+252,7
@@
iswprint
return wc >= ' ' && wc <= '~';
}
return wc >= ' ' && wc <= '~';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswpunct
# else
# if @REPLACE_ISWCNTRL@
rpl_iswpunct
# else
@@
-251,7
+265,7
@@
iswpunct
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
}
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')));
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswspace
# else
# if @REPLACE_ISWCNTRL@
rpl_iswspace
# else
@@
-263,7
+277,7
@@
iswspace
|| wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
}
|| wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r');
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswupper
# else
# if @REPLACE_ISWCNTRL@
rpl_iswupper
# else
@@
-274,7
+288,7
@@
iswupper
return wc >= 'A' && wc <= 'Z';
}
return wc >= 'A' && wc <= 'Z';
}
-
static inline
int
+
_GL_WCTYPE_INLINE
int
# if @REPLACE_ISWCNTRL@
rpl_iswxdigit
# else
# if @REPLACE_ISWCNTRL@
rpl_iswxdigit
# else
@@
-286,7
+300,7
@@
iswxdigit
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
}
|| ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'));
}
-
static inline
wint_t
+
_GL_WCTYPE_INLINE
wint_t
# if @REPLACE_TOWLOWER@
rpl_towlower
# else
# if @REPLACE_TOWLOWER@
rpl_towlower
# else
@@
-297,7
+311,7
@@
towlower
return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
}
return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc);
}
-
static inline
wint_t
+
_GL_WCTYPE_INLINE
wint_t
# if @REPLACE_TOWLOWER@
rpl_towupper
# else
# if @REPLACE_TOWLOWER@
rpl_towupper
# else
@@
-337,7
+351,7
@@
_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
result register. We need to fix this by adding a zero-extend from
wchar_t to wint_t after the call. */
result register. We need to fix this by adding a zero-extend from
wchar_t to wint_t after the call. */
-
static inline
wint_t
+
_GL_WCTYPE_INLINE
wint_t
rpl_towlower (wint_t wc)
{
return (wint_t) (wchar_t) towlower (wc);
rpl_towlower (wint_t wc)
{
return (wint_t) (wchar_t) towlower (wc);
@@
-346,7
+360,7
@@
rpl_towlower (wint_t wc)
# define towlower rpl_towlower
# endif
# define towlower rpl_towlower
# endif
-
static inline
wint_t
+
_GL_WCTYPE_INLINE
wint_t
rpl_towupper (wint_t wc)
{
return (wint_t) (wchar_t) towupper (wc);
rpl_towupper (wint_t wc)
{
return (wint_t) (wchar_t) towupper (wc);
@@
-494,6
+508,7
@@
_GL_WARN_ON_USE (towctrans, "towctrans is unportable - "
# endif
#endif
# endif
#endif
+_GL_INLINE_HEADER_END
#endif /* _@GUARD_PREFIX@_WCTYPE_H */
#endif /* _@GUARD_PREFIX@_WCTYPE_H */
#endif /* _@GUARD_PREFIX@_WCTYPE_H */
#endif /* _@GUARD_PREFIX@_WCTYPE_H */