From: Jim Meyering <jim@meyering.net>
Date: Tue, 18 Mar 2003 15:40:13 +0000 (+0000)
Subject: (excluded_filename): Define and use typedef to
X-Git-Tag: v4.5.11~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f3bedb89aec1aaac867f1d92df1475904266698;p=thirdparty%2Fcoreutils.git

(excluded_filename): Define and use typedef to
avoid type mismatch in conditional expression.
---

diff --git a/lib/exclude.c b/lib/exclude.c
index 9337e74a90..565e2458df 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -1,6 +1,6 @@
 /* exclude.c -- exclude file names
 
-   Copyright (C) 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2002 Free
+   Copyright (C) 1992, 1993, 1994, 1997, 1999, 2000, 2001, 2002, 2003 Free
    Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -173,9 +173,11 @@ excluded_filename (struct exclude const *ex, char const *f)
 	  int options = exclude[i].options;
 	  if (excluded == !! (options & EXCLUDE_INCLUDE))
 	    {
-	      int (*matcher) PARAMS ((char const *, char const *, int)) =
+	      typedef int (*fnmatch_t)
+		PARAMS ((char const *, char const *, int));
+	      fnmatch_t matcher =
 		(options & EXCLUDE_WILDCARDS
-		 ? fnmatch
+		 ? (fnmatch_t) fnmatch
 		 : fnmatch_no_wildcards);
 	      bool matched = ((*matcher) (pattern, f, options) == 0);
 	      char const *p;