From 69ac3f3e2d0f2e6c6d2f7a97a780325485aaef0e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 11 Aug 2018 02:23:48 +0200 Subject: [PATCH] fnmatch: Fix compilation error in C++ namespace mode on Mac OS X. * modules/fnmatch-gnu (configure.ac): Invoke gl_MODULE_INDICATOR. * lib/fnmatch.in.h (fnmatch): Skip _GL_CXXALIASWARN if module 'fnmatch-gnu' is in use. --- ChangeLog | 7 +++++++ lib/fnmatch.in.h | 2 ++ modules/fnmatch-gnu | 1 + 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index a1c0abbaba..404af4f13e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-08-10 Bruno Haible + + fnmatch: Fix compilation error in C++ namespace mode on Mac OS X. + * modules/fnmatch-gnu (configure.ac): Invoke gl_MODULE_INDICATOR. + * lib/fnmatch.in.h (fnmatch): Skip _GL_CXXALIASWARN if module + 'fnmatch-gnu' is in use. + 2018-08-07 Bruno Haible glob-h: Add tests. diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index 50eeed7aaa..e15d6cc83b 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -93,7 +93,9 @@ _GL_FUNCDECL_SYS (fnmatch, int, _GL_CXXALIAS_SYS (fnmatch, int, (const char *pattern, const char *name, int flags)); # endif +# if !GNULIB_FNMATCH_GNU _GL_CXXALIASWARN (fnmatch); +# endif #elif defined GNULIB_POSIXCHECK # undef fnmatch # if HAVE_RAW_DECL_FNMATCH diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu index 54726278fa..86b522547e 100644 --- a/modules/fnmatch-gnu +++ b/modules/fnmatch-gnu @@ -12,6 +12,7 @@ if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then AC_LIBOBJ([fnmatch]) gl_PREREQ_FNMATCH fi +gl_MODULE_INDICATOR([fnmatch-gnu]) Makefile.am: -- 2.39.5