Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
retrieving revision 1.84.2.33
diff -u -r1.84.2.33 Makefile.am
--- Makefile.am	21 Jun 2001 20:06:14 -0000	1.84.2.33
+++ Makefile.am	9 Sep 2002 20:17:06 -0000
@@ -261,8 +261,6 @@
 	gtkvseparator.c		\
 	gtkwidget.c		\
 	gtkwindow.c		\
-	fnmatch.c		\
-	fnmatch.h		\
 @STRIP_END@
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -299,6 +297,8 @@
 	gtk-boxed.defs		\
 	genmarshal.pl		\
 	gtkmarshal.list		\
+	fnmatch.c		\
+	fnmatch.h		\
 @STRIP_END@
 # Extra headers that are used for enum type array/id generation
 gdk_headers = @STRIP_BEGIN@ \
Index: gtkfilesel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilesel.c,v
retrieving revision 1.46.2.5
diff -u -r1.46.2.5 gtkfilesel.c
--- gtkfilesel.c	1 Feb 2001 23:32:41 -0000	1.46.2.5
+++ gtkfilesel.c	9 Sep 2002 20:17:06 -0000
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <errno.h>
 #include <pwd.h>
-#include "fnmatch.h"
+#include "fnmatch.c"
 
 #include "gdk/gdkkeysyms.h"
 #include "gtkbutton.h"
Index: fnmatch.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/fnmatch.c,v
retrieving revision 1.7.2.1
diff -u -r1.7.2.1 fnmatch.c
--- fnmatch.c	2 Feb 2001 20:25:13 -0000	1.7.2.1
+++ fnmatch.c	9 Sep 2002 20:17:06 -0000
@@ -56,7 +56,7 @@
 
 /* Match STRING against the filename pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
-int
+static int
 fnmatch (pattern, string, flags)
      const char *pattern;
      const char *string;
Index: fnmatch.h
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/fnmatch.h,v
retrieving revision 1.3
diff -u -r1.3 fnmatch.h
--- fnmatch.h	24 Feb 1999 07:33:23 -0000	1.3
+++ fnmatch.h	9 Sep 2002 20:17:06 -0000
@@ -65,7 +65,7 @@
 
 /* Match STRING against the filename pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.  */
-extern int fnmatch __P ((const char *__pattern, const char *__string,
+static int fnmatch __P ((const char *__pattern, const char *__string,
 			 int __flags));
 
 #ifdef	__cplusplus
