From 03d7a6b1fa91b8a22b3b335ee8e70536e4dd65e4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 14 Feb 2020 19:44:08 +0100 Subject: [PATCH] wctype-h: Fix compilation errors in C++ (regression from 2020-01-25). Reported by Christian Biesinger in . * lib/wctype.in.h (iswdigit, iswxdigit): Don't declare if the corresponding module is not enabled. * tests/test-wctype-h-c++.cc (iswdigit, iswxdigit): Don't check the prototype if the corresponding module is not enabled. --- ChangeLog | 10 ++++++++++ lib/wctype.in.h | 12 ++++++++---- tests/test-wctype-h-c++.cc | 4 ++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bcf1bf0ad..dfaf6cc923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2020-02-14 Bruno Haible + + wctype-h: Fix compilation errors in C++ (regression from 2020-01-25). + Reported by Christian Biesinger in + . + * lib/wctype.in.h (iswdigit, iswxdigit): Don't declare if the + corresponding module is not enabled. + * tests/test-wctype-h-c++.cc (iswdigit, iswxdigit): Don't check the + prototype if the corresponding module is not enabled. + 2020-02-13 Paul Eggert fchmodat, lchmod: port to buggy Linux filesystems diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 5d266d9b83..06f3e073ab 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -556,10 +556,12 @@ _GL_CXXALIAS_RPL (iswcntrl, int, (wint_t wc)); #else _GL_CXXALIAS_SYS (iswcntrl, int, (wint_t wc)); #endif -#if @REPLACE_ISWDIGIT@ +#if @GNULIB_ISWDIGIT@ +# if @REPLACE_ISWDIGIT@ _GL_CXXALIAS_RPL (iswdigit, int, (wint_t wc)); -#else +# else _GL_CXXALIAS_SYS (iswdigit, int, (wint_t wc)); +# endif #endif #if @REPLACE_ISWCNTRL@ _GL_CXXALIAS_RPL (iswgraph, int, (wint_t wc)); @@ -591,10 +593,12 @@ _GL_CXXALIAS_RPL (iswupper, int, (wint_t wc)); #else _GL_CXXALIAS_SYS (iswupper, int, (wint_t wc)); #endif -#if @REPLACE_ISWXDIGIT@ +#if @GNULIB_ISWXDIGIT@ +# if @REPLACE_ISWXDIGIT@ _GL_CXXALIAS_RPL (iswxdigit, int, (wint_t wc)); -#else +# else _GL_CXXALIAS_SYS (iswxdigit, int, (wint_t wc)); +# endif #endif #if __GLIBC__ >= 2 _GL_CXXALIASWARN (iswalnum); diff --git a/tests/test-wctype-h-c++.cc b/tests/test-wctype-h-c++.cc index 76a83bc5da..ccc8369d66 100644 --- a/tests/test-wctype-h-c++.cc +++ b/tests/test-wctype-h-c++.cc @@ -27,14 +27,18 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalnum, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswalpha, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswcntrl, int, (wint_t)); +#if GNULIB_TEST_ISWDIGIT SIGNATURE_CHECK (GNULIB_NAMESPACE::iswdigit, int, (wint_t)); +#endif SIGNATURE_CHECK (GNULIB_NAMESPACE::iswgraph, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswlower, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswprint, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswpunct, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswspace, int, (wint_t)); SIGNATURE_CHECK (GNULIB_NAMESPACE::iswupper, int, (wint_t)); +#if GNULIB_TEST_ISWXDIGIT SIGNATURE_CHECK (GNULIB_NAMESPACE::iswxdigit, int, (wint_t)); +#endif #if GNULIB_TEST_ISWBLANK SIGNATURE_CHECK (GNULIB_NAMESPACE::iswblank, int, (wint_t)); #endif -- 2.39.5