Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/fnmatch.c,v
retrieving revision 1.11.4.1
retrieving revision 1.12
diff -u -p -r1.11.4.1 -r1.12
--- src/lib/libc/gen/fnmatch.c	1996/09/19 20:02:33	1.11.4.1
+++ src/lib/libc/gen/fnmatch.c	1997/07/13 18:57:26	1.12
@@ -1,4 +1,4 @@
-/*	$NetBSD: fnmatch.c,v 1.11.4.1 1996/09/19 20:02:33 jtc Exp $	*/
+/*	$NetBSD: fnmatch.c,v 1.12 1997/07/13 18:57:26 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -36,11 +36,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$NetBSD: fnmatch.c,v 1.11.4.1 1996/09/19 20:02:33 jtc Exp $";
+__RCSID("$NetBSD: fnmatch.c,v 1.12 1997/07/13 18:57:26 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,14 +50,9 @@ static char rcsid[] = "$NetBSD: fnmatch.
  * Compares a filename or pathname to a pattern.
  */
 
-#include "namespace.h"
 #include <fnmatch.h>
 #include <string.h>
 
-#ifdef __weak_alias
-__weak_alias(fnmatch,_fnmatch);
-#endif
-
 #define	EOS	'\0'
 
 static const char *rangematch __P((const char *, int, int));
@@ -158,7 +154,7 @@ rangematch(pattern, test, flags)
 	 * consistency with the regular expression syntax.
 	 * J.T. Conklin (conklin@ngai.kaleida.com)
 	 */
-	if (negate = (*pattern == '!' || *pattern == '^'))
+	if ((negate = (*pattern == '!' || *pattern == '^')) != 0)
 		++pattern;
 	
 	for (ok = 0; (c = *pattern++) != ']';) {