From 2556eb8d41afaead7dd979ae52d6f6c0d61c88b3 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 26 Oct 2005 22:16:34 +0000 Subject: 2005-10-26 Shaun Jackman * libc/posix/scandir.c (scandir): Update the function prototype to match the header. * libc/sys/linux/linuxthreads/bits/libc-lock.h: Remove an extraneous #endif. * libc/sys/linux/sys/lock.h: Do not include machine/weakalias.h, since it's not used by this file. --- newlib/libc/posix/scandir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'newlib/libc/posix/scandir.c') diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c index 97094a676..2cd586050 100644 --- a/newlib/libc/posix/scandir.c +++ b/newlib/libc/posix/scandir.c @@ -74,8 +74,8 @@ int _DEFUN(scandir, (dirname, namelist, select, dcomp), const char *dirname _AND struct dirent ***namelist _AND - int (*select) __P((struct dirent *)) _AND - int (*dcomp) __P((const void *, const void *))) + int (*select) __P((const struct dirent *)) _AND + int (*dcomp) __P((const struct dirent **, const struct dirent **))) { register struct dirent *d, *p, **names; register size_t nitems; @@ -155,7 +155,7 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp), } closedir(dirp); if (nitems && dcomp != NULL) - qsort(names, nitems, sizeof(struct dirent *), dcomp); + qsort(names, nitems, sizeof(struct dirent *), (void *)dcomp); *namelist = names; #ifdef HAVE_DD_LOCK __lock_release_recursive(dirp->dd_lock); -- cgit v1.2.3