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/glob.c,v
retrieving revision 1.5.4.2
retrieving revision 1.6
diff -u -p -r1.5.4.2 -r1.6
--- src/lib/libc/gen/glob.c	1996/09/19 20:03:12	1.5.4.2
+++ src/lib/libc/gen/glob.c	1997/07/13 19:15:11	1.6
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.c,v 1.5.4.2 1996/09/19 20:03:12 jtc Exp $	*/
+/*	$NetBSD: glob.c,v 1.6 1997/07/13 19:15:11 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -36,11 +36,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$NetBSD: glob.c,v 1.5.4.2 1996/09/19 20:03:12 jtc Exp $";
+__RCSID("$NetBSD: glob.c,v 1.6 1997/07/13 19:15:11 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -69,7 +70,6 @@ static char rcsid[] = "$NetBSD: glob.c,v
  *	Number of matches in the current invocation of glob.
  */
 
-#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -83,11 +83,6 @@ static char rcsid[] = "$NetBSD: glob.c,v
 #include <string.h>
 #include <unistd.h>
 
-#ifdef __weak_alias
-__weak_alias(glob,_glob);
-__weak_alias(globfree,_globfree);
-#endif
-
 #define	DOLLAR		'$'
 #define	DOT		'.'
 #define	EOS		'\0'
@@ -580,7 +575,7 @@ glob3(pathbuf, pathend, pattern, restpat
 	 * and dirent.h as taking pointers to differently typed opaque
 	 * structures.
 	 */
-	struct dirent *(*readdirfunc)();
+	struct dirent *(*readdirfunc) __P((void *));
 
 	*pathend = EOS;
 	errno = 0;
@@ -602,7 +597,7 @@ glob3(pathbuf, pathend, pattern, restpat
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
 		readdirfunc = pglob->gl_readdir;
 	else
-		readdirfunc = readdir;
+		readdirfunc = (struct dirent *(*)__P((void *))) readdir;
 	while ((dp = (*readdirfunc)(dirp))) {
 		register u_char *sc;
 		register Char *dc;