diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2005-10-26 22:16:34 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2005-10-26 22:16:34 +0000 |
| commit | 2556eb8d41afaead7dd979ae52d6f6c0d61c88b3 (patch) | |
| tree | ebd3640745b6e171fff2fce991367cf5ac5850a5 /newlib/libc/posix/scandir.c | |
| parent | c9d71a8d46f0ac46c242e03b063a04c0c9bb4e7a (diff) | |
| download | cygnal-2556eb8d41afaead7dd979ae52d6f6c0d61c88b3.tar.gz cygnal-2556eb8d41afaead7dd979ae52d6f6c0d61c88b3.tar.bz2 cygnal-2556eb8d41afaead7dd979ae52d6f6c0d61c88b3.zip | |
2005-10-26 Shaun Jackman <sjackman@gmail.com>
* 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.
Diffstat (limited to 'newlib/libc/posix/scandir.c')
| -rw-r--r-- | newlib/libc/posix/scandir.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |