From 57049b2265f5d6d1d25cff7e71cf6ddcfe8ac5bb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 28 Jul 2023 15:15:26 +0200 Subject: [PATCH] uchar: Include the necessary snippets. * lib/uchar.in.h: Add insertion points for _GL_ARG_NONNULL and _GL_WARN_ON_USE. * modules/uchar (Depends-on): Add snippet/arg-nonnull, snippet/warn-on-use. (Makefile.am): In uchar.h, include the ARG_NONNULL_H and WARN_ON_USE_H snippets. --- ChangeLog | 10 ++++++++++ lib/uchar.in.h | 4 ++++ modules/uchar | 6 +++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b1ccb85e9a..0f9b9b2db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2023-07-28 Bruno Haible + + uchar: Include the necessary snippets. + * lib/uchar.in.h: Add insertion points for _GL_ARG_NONNULL and + _GL_WARN_ON_USE. + * modules/uchar (Depends-on): Add snippet/arg-nonnull, + snippet/warn-on-use. + (Makefile.am): In uchar.h, include the ARG_NONNULL_H and WARN_ON_USE_H + snippets. + 2023-07-28 Bruno Haible mbmemcasecmp, mbmemcasecoll: Avoid test failure on MSVC. diff --git a/lib/uchar.in.h b/lib/uchar.in.h index 15c4818aed..ed1a688d0c 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -72,6 +72,10 @@ /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ +/* The definition of _GL_ARG_NONNULL is copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + _GL_INLINE_HEADER_BEGIN diff --git a/modules/uchar b/modules/uchar index 69ce596869..c1e8c689af 100644 --- a/modules/uchar +++ b/modules/uchar @@ -9,7 +9,9 @@ m4/stdint.m4 Depends-on: gen-header include_next +snippet/arg-nonnull snippet/c++defs +snippet/warn-on-use extern-inline assert-h stdint @@ -23,7 +25,7 @@ AC_PROG_MKDIR_P Makefile.am: BUILT_SOURCES += uchar.h -uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) +uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) @NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' $(gl_V_at)$(SED_HEADER_STDOUT) \ -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ @@ -76,6 +78,8 @@ uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \ -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ $(srcdir)/uchar.in.h > $@-t $(AM_V_at)mv $@-t $@ MOSTLYCLEANFILES += uchar.h uchar.h-t -- 2.39.5