[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Latest changes in langinfo break libunistring build
From: |
Bruno Haible |
Subject: |
Re: Latest changes in langinfo break libunistring build |
Date: |
Fri, 26 Jan 2018 05:53:45 +0100 |
User-agent: |
KMail/5.1.3 (Linux/4.4.0-104-generic; KDE/5.18.0; x86_64; ; ) |
Hi Tim,
> reported by oss-fuzz and reproducible locally when building
> libunistring (latest master):
>
>
> gcc -DHAVE_CONFIG_H -DNO_XMALLOC -I. -I.. -I. -I. -I.. -I..
> -DIN_LIBUNISTRING -DDEPENDS_ON_LIBICONV=1 -g -Og -Wall -Wextra -c
> localcharset.c
> In file included from localcharset.c:59:0:
> ./langinfo.h:163:7: error: token "@" is not valid in preprocessor
> expressions
> # if address@hidden@
> ^
Oops. Thanks for the quick report! Fixed:
2018-01-26 Bruno Haible <address@hidden>
langinfo: Fix last commit.
Reported by Tim Rühsen <address@hidden>.
* modules/langinfo (Makefile.am): Substitute HAVE_LANGINFO_ALTMON.
diff --git a/modules/langinfo b/modules/langinfo
index 71bf407..6be975d 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -31,6 +31,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status
$(CXXDEFS_H) $(WARN_ON_U
-e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
-e
's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+ -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
-e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
-e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \