diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-01-30 14:28:09 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2024-01-31 09:42:39 +0000 |
| commit | 9bf91fa360156476bce9899394f81b1e875593f4 (patch) | |
| tree | 6f21cb8944d132d6879901c0619dd10f36540954 | |
| parent | 358fd42aabec56e471ed3c8e6f3dccbc305ff6f7 (diff) | |
| download | gcc-9bf91fa360156476bce9899394f81b1e875593f4.zip gcc-9bf91fa360156476bce9899394f81b1e875593f4.tar.gz gcc-9bf91fa360156476bce9899394f81b1e875593f4.tar.bz2 | |
libstdc++: Enable std::text_encoding for darwin and FreeBSD
The <xlocale.h> header is needed for newlocale and locale_t on these
targets.
libstdc++-v3/ChangeLog:
* acinclude.m4 (GLIBCXX_CHECK_TEXT_ENCODING): Use <xlocale.h> if
needed for newlocale.
* configure: Regenerate.
* src/c++26/text_encoding.cc: Use <xlocale.h>.
Reviewed-by: Iain Sandoe <iain@sandoe.co.uk>
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 3 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 3 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++26/text_encoding.cc | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index f9ba7ef..f72bd0f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -5834,6 +5834,9 @@ AC_LANG_SAVE AC_MSG_CHECKING([whether nl_langinfo_l is defined in <langinfo.h>]) AC_TRY_COMPILE([ #include <locale.h> + #if __has_include(<xlocale.h>) + # include <xlocale.h> + #endif #include <langinfo.h> ],[ locale_t loc = newlocale(LC_ALL_MASK, "", (locale_t)0); diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 65ce679..f4bc048 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -54533,6 +54533,9 @@ $as_echo_n "checking whether nl_langinfo_l is defined in <langinfo.h>... " >&6; /* end confdefs.h. */ #include <locale.h> + #if __has_include(<xlocale.h>) + # include <xlocale.h> + #endif #include <langinfo.h> int diff --git a/libstdc++-v3/src/c++26/text_encoding.cc b/libstdc++-v3/src/c++26/text_encoding.cc index 33c6c07..b9a50ef 100644 --- a/libstdc++-v3/src/c++26/text_encoding.cc +++ b/libstdc++-v3/src/c++26/text_encoding.cc @@ -27,6 +27,9 @@ #ifdef _GLIBCXX_USE_NL_LANGINFO_L #include <locale.h> +#if __has_include(<xlocale.h>) +# include <xlocale.h> +#endif #include <langinfo.h> #if __CHAR_BIT__ == 8 |