Mercurial > gnulib

changeset 39497:376d06f8f917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 11 Aug 2018 02:23:48 +0200
parents dfd69627235c
children 4b384a2f6639
files ChangeLog lib/fnmatch.in.h modules/fnmatch-gnu
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 10 14:28:55 2018 -0700
+++ b/ChangeLog	Sat Aug 11 02:23:48 2018 +0200
@@ -1,3 +1,10 @@
+2018-08-10  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	glob-h: Add tests.
--- a/lib/fnmatch.in.h	Fri Aug 10 14:28:55 2018 -0700
+++ b/lib/fnmatch.in.h	Sat Aug 11 02:23:48 2018 +0200
@@ -93,7 +93,9 @@
 _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
--- a/modules/fnmatch-gnu	Fri Aug 10 14:28:55 2018 -0700
+++ b/modules/fnmatch-gnu	Sat Aug 11 02:23:48 2018 +0200
@@ -12,6 +12,7 @@
   AC_LIBOBJ([fnmatch])
   gl_PREREQ_FNMATCH
 fi
+gl_MODULE_INDICATOR([fnmatch-gnu])
 
 Makefile.am: