From 3f1d1d909e303b6fdb101543c1a835ef71a941dc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Aug 2018 03:00:13 +0200 Subject: [PATCH] fnmatch: Avoid conflicting macro definitions of 'fnmatch'. Reported by Reuben Thomas in . * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): Don't define 'fnmatch' as a macro in config.h. --- ChangeLog | 8 ++++++++ m4/fnmatch.m4 | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2264d83b95..e6f24fae9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-08-18 Bruno Haible + + fnmatch: Avoid conflicting macro definitions of 'fnmatch'. + Reported by Reuben Thomas in + . + * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): Don't define 'fnmatch' as a macro + in config.h. + 2018-08-18 Bruno Haible Avoid -Wcast-function-type warnings from casts after GetProcAddress. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 94145141da..f05f84508f 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,4 +1,4 @@ -# Check for fnmatch - serial 11. -*- coding: utf-8 -*- +# Check for fnmatch - serial 12. -*- coding: utf-8 -*- # Copyright (C) 2000-2007, 2009-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -140,11 +140,6 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU], AC_DEFUN([gl_PREREQ_FNMATCH], [ - dnl We must choose a different name for our function, since on ELF systems - dnl a broken fnmatch() in libc.so would override our fnmatch() if it is - dnl compiled into a shared library. - AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch], - [Define to a replacement function name for fnmatch().]) dnl Prerequisites of lib/fnmatch.c. AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_CHECK_DECLS([isblank], [], [], [[#include ]]) -- 2.39.5