From 8b857ed1ad1cbbf265d43016ee7ee93c7b7c6cb4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Apr 2021 15:54:18 +0200 Subject: [PATCH 2/3] Rename GNULIB_OVERRIDES_CHAR16_T, GNULIB_OVERRIDES_CHAR32_T. * GNULIBHEADERS_OVERRIDE_CHAR16_T: Renamed from GNULIB_OVERRIDES_CHAR16_T. * GNULIBHEADERS_OVERRIDE_CHAR32_T: Renamed from GNULIB_OVERRIDES_CHAR32_T. --- ChangeLog | 6 ++++++ lib/uchar.in.h | 4 ++-- m4/mbrtoc32.m4 | 6 +++--- m4/uchar.m4 | 10 +++++----- modules/uchar | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 303747d..aeb2476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2021-04-11 Bruno Haible + Rename GNULIB_OVERRIDES_CHAR16_T, GNULIB_OVERRIDES_CHAR32_T. + * GNULIBHEADERS_OVERRIDE_CHAR16_T: Renamed from + GNULIB_OVERRIDES_CHAR16_T. + * GNULIBHEADERS_OVERRIDE_CHAR32_T: Renamed from + GNULIB_OVERRIDES_CHAR32_T. + Rename GNULIB_OVERRIDES_WINT_T. * GNULIBHEADERS_OVERRIDE_WINT_T: Renamed from GNULIB_OVERRIDES_WINT_T. diff --git a/lib/uchar.in.h b/lib/uchar.in.h index ba96335..f52535a 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -47,7 +47,7 @@ on which __STDC_UTF_16__ is defined.) */ typedef uint_least16_t char16_t; -#elif @GNULIB_OVERRIDES_CHAR16_T@ +#elif @GNULIBHEADERS_OVERRIDE_CHAR16_T@ typedef uint_least16_t gl_char16_t; # define char16_t gl_char16_t @@ -61,7 +61,7 @@ typedef uint_least16_t gl_char16_t; on which __STDC_UTF_32__ is defined.) */ typedef uint_least32_t char32_t; -#elif @GNULIB_OVERRIDES_CHAR32_T@ +#elif @GNULIBHEADERS_OVERRIDE_CHAR32_T@ typedef uint_least32_t gl_char32_t; # define char32_t gl_char32_t diff --git a/m4/mbrtoc32.m4 b/m4/mbrtoc32.m4 index ba0397b..0966ea1 100644 --- a/m4/mbrtoc32.m4 +++ b/m4/mbrtoc32.m4 @@ -1,4 +1,4 @@ -# mbrtoc32.m4 serial 7 +# mbrtoc32.m4 serial 8 dnl Copyright (C) 2014-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_MBRTOC32], if test $gl_cv_func_mbrtoc32 = no; then HAVE_MBRTOC32=0 else - if test $GNULIB_OVERRIDES_CHAR32_T = 1 || test $REPLACE_MBSTATE_T = 1; then + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $REPLACE_MBSTATE_T = 1; then REPLACE_MBRTOC32=1 else gl_MBRTOC32_EMPTY_INPUT @@ -147,7 +147,7 @@ AC_DEFUN([gl_MBRTOC32_SANITYCHECK], AC_REQUIRE([gt_LOCALE_FR]) AC_REQUIRE([gt_LOCALE_ZH_CN]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - if test $GNULIB_OVERRIDES_CHAR32_T = 1 || test $gl_cv_func_mbrtoc32 = no; then + if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $gl_cv_func_mbrtoc32 = no; then HAVE_WORKING_MBRTOC32=0 else AC_CACHE_CHECK([whether mbrtoc32 works as well as mbrtowc], diff --git a/m4/uchar.m4 b/m4/uchar.m4 index 0729541..62c6e06 100644 --- a/m4/uchar.m4 +++ b/m4/uchar.m4 @@ -1,4 +1,4 @@ -# uchar.m4 serial 17 +# uchar.m4 serial 18 dnl Copyright (C) 2019-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -91,7 +91,7 @@ AC_DEFUN_ONCE([gl_TYPE_CHAR16_T], [gl_cv_type_char16_t_works=no]) ]) if test $gl_cv_type_char16_t_works = no; then - GNULIB_OVERRIDES_CHAR16_T=1 + GNULIBHEADERS_OVERRIDE_CHAR16_T=1 fi ]) AC_DEFUN_ONCE([gl_TYPE_CHAR32_T], @@ -112,7 +112,7 @@ AC_DEFUN_ONCE([gl_TYPE_CHAR32_T], [gl_cv_type_char32_t_works=no]) ]) if test $gl_cv_type_char32_t_works = no; then - GNULIB_OVERRIDES_CHAR32_T=1 + GNULIBHEADERS_OVERRIDE_CHAR32_T=1 fi ]) @@ -127,8 +127,8 @@ AC_DEFUN([gl_UCHAR_MODULE_INDICATOR], AC_DEFUN([gl_UCHAR_H_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_CHAR16_T]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_CHAR32_T]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIBHEADERS_OVERRIDE_CHAR16_T]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIBHEADERS_OVERRIDE_CHAR32_T]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOC32]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALNUM]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALPHA]) diff --git a/modules/uchar b/modules/uchar index 7cddcad..e449dd9 100644 --- a/modules/uchar +++ b/modules/uchar @@ -29,8 +29,8 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) -e 's|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \ -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \ -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \ - -e 's|@''GNULIB_OVERRIDES_CHAR16_T''@|$(GNULIB_OVERRIDES_CHAR16_T)|g' \ - -e 's|@''GNULIB_OVERRIDES_CHAR32_T''@|$(GNULIB_OVERRIDES_CHAR32_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \ + -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \ -e 's/@''GNULIB_BTOC32''@/$(GNULIB_BTOC32)/g' \ -e 's/@''GNULIB_C32ISALNUM''@/$(GNULIB_C32ISALNUM)/g' \ -e 's/@''GNULIB_C32ISALPHA''@/$(GNULIB_C32ISALPHA)/g' \ -- 2.7.4