diff options
author | Bruno Haible <bruno@clisp.org> | 2019-12-04 04:49:58 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2019-12-04 04:50:42 +0100 |
commit | 3ef3dd8d3523725e0b13c2a2ef4c99217d2446c1 (patch) | |
tree | 60eaa3868a0d986204894c073bcd0ef2b6d78afe | |
parent | 56a2150cb8f33d7868f42098702173a0ccb38760 (diff) | |
download | gnulib-3ef3dd8d3523725e0b13c2a2ef4c99217d2446c1.tar.gz gnulib-3ef3dd8d3523725e0b13c2a2ef4c99217d2446c1.tar.bz2 |
Disable more _GL_CXXALIASWARN on all platforms other than glibc systems.
* lib/wchar.in.h (wcsnrtombs, wcwidth, wcswidth): Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* lib/wctype.in.h (iswalnum, iswalpha, iswcntrl, iswdigit, iswgraph,
iswlower, iswprint, iswpunct, iswspace, iswupper, iswxdigit, wctype,
iswctype, towlower, towupper): Likewise.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/wchar.in.h | 6 | ||||
-rw-r--r-- | lib/wctype.in.h | 8 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2019-12-04 Bruno Haible <bruno@clisp.org> + + Disable more _GL_CXXALIASWARN on all platforms other than glibc systems. + * lib/wchar.in.h (wcsnrtombs, wcwidth, wcswidth): Disable + _GL_CXXALIASWARN invocation on non-glibc systems. + * lib/wctype.in.h (iswalnum, iswalpha, iswcntrl, iswdigit, iswgraph, + iswlower, iswprint, iswpunct, iswspace, iswupper, iswxdigit, wctype, + iswctype, towlower, towupper): Likewise. + 2019-12-03 Bruno Haible <bruno@clisp.org> Avoid hassles caused by [[noreturn]] in C++. diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 043a592495..f081be648d 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -446,7 +446,9 @@ _GL_CXXALIAS_SYS (wcsnrtombs, size_t, (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcsnrtombs); +# endif #elif defined GNULIB_POSIXCHECK # undef wcsnrtombs # if HAVE_RAW_DECL_WCSNRTOMBS @@ -472,7 +474,9 @@ _GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcwidth); +# endif #elif defined GNULIB_POSIXCHECK # undef wcwidth # if HAVE_RAW_DECL_WCWIDTH @@ -1085,7 +1089,9 @@ _GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n) # endif _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wcswidth); +# endif #elif defined GNULIB_POSIXCHECK # undef wcswidth # if HAVE_RAW_DECL_WCSWIDTH diff --git a/lib/wctype.in.h b/lib/wctype.in.h index b3edb0d984..cb453024c1 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -540,6 +540,7 @@ _GL_CXXALIAS_SYS (iswspace, int, (wint_t wc)); _GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); _GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); #endif +#if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswalnum); _GL_CXXALIASWARN (iswalpha); _GL_CXXALIASWARN (iswcntrl); @@ -551,6 +552,7 @@ _GL_CXXALIASWARN (iswpunct); _GL_CXXALIASWARN (iswspace); _GL_CXXALIASWARN (iswupper); _GL_CXXALIASWARN (iswxdigit); +#endif #if @GNULIB_ISWBLANK@ # if @REPLACE_ISWCNTRL@ || @REPLACE_ISWBLANK@ @@ -576,7 +578,9 @@ typedef void * wctype_t; _GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)); # endif _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (wctype); +# endif #elif defined GNULIB_POSIXCHECK # undef wctype # if HAVE_RAW_DECL_WCTYPE @@ -602,7 +606,9 @@ _GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc)); # endif _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswctype); +# endif #elif defined GNULIB_POSIXCHECK # undef iswctype # if HAVE_RAW_DECL_ISWCTYPE @@ -618,8 +624,10 @@ _GL_CXXALIAS_RPL (towupper, wint_t, (wint_t wc)); _GL_CXXALIAS_SYS (towlower, wint_t, (wint_t wc)); _GL_CXXALIAS_SYS (towupper, wint_t, (wint_t wc)); #endif +#if __GLIBC__ >= 2 _GL_CXXALIASWARN (towlower); _GL_CXXALIASWARN (towupper); +#endif #if !@HAVE_WCTRANS_T@ # if !GNULIB_defined_wctrans_t |