+2023-07-28 Bruno Haible <bruno@clisp.org>
+
+ 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-23 Bruno Haible <bruno@clisp.org>
fnmatch: Work around bugs on FreeBSD, NetBSD, Solaris, Cygwin, Android.
/* 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. */
+
#if !(@HAVE_UCHAR_H@ || (defined __cplusplus && @CXX_HAS_UCHAR_TYPES@))
Depends-on:
gen-header
include_next
+snippet/arg-nonnull
snippet/c++defs
+snippet/warn-on-use
stdint
wchar
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' \
-e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|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