diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
| commit | 7434ccadbb6897d366d2377f84efe1e2cd61b02b (patch) | |
| tree | f8ba8ee60bf079077654583d3b7e92b63940ab19 /stdlib | |
| parent | 795fbc9aa183e10526f6545e28cabf03be7feaf9 (diff) | |
| download | glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.zip glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.gz glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.bz2 | |
update from main archive 970214cvs/root-libc-2_0_x-branch
1997-02-13 11:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdlib/qsort.c: Add prototype for _quicksort.
* stdlib/msort.c (qsort): Correct prototype for _quicksort.
* sysdeps/i386/Makefile (CFLAGS-rtld.c): Change to prevent warning
from dl-machine.h.
1997-02-13 18:18 Marcus G. Daniels <marcus@sysc.pdx.edu>
* sysdeps/generic/dl-cache.c: Don't hardwire name of cache file.
Allow user to overwrite it.
1997-02-13 17:55 Ulrich Drepper <drepper@cygnus.com>
* libio/_G_config.h: Make sure win_t is also defined for old gcc
versions. Reported by Andreas Jaeger.
1997-02-13 11:44 Andreas Jaeger <aj@arthur.pfalz.de>
* db/btree/bt_split.c (bt_psplit): Fix typo in change of
1997-02-12.
* time/tzfile.c (__tzfile_read): Change comment to follow
change of 1997-02-12.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/msort.c | 4 | ||||
| -rw-r--r-- | stdlib/qsort.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/stdlib/msort.c b/stdlib/msort.c index 9e2c3e4..4cd3e3f 100644 --- a/stdlib/msort.c +++ b/stdlib/msort.c @@ -1,4 +1,4 @@ -/* msort -- an alternative to qsort, with an identical interface. +/* An alternative to qsort, with an identical interface. This file is part of the GNU C Library. Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc. Written by Mike Haertel, September 1988. @@ -109,7 +109,7 @@ qsort (b, n, s, cmp) { /* Couldn't get space, so use the slower algorithm that doesn't need a temporary array. */ - extern void _quicksort __P ((void *__base, + extern void _quicksort __P ((void *const __base, size_t __nmemb, size_t __size, __compar_fn_t __compar)); _quicksort (b, n, s, cmp); diff --git a/stdlib/qsort.c b/stdlib/qsort.c index 7e36ffe..72d6b24 100644 --- a/stdlib/qsort.c +++ b/stdlib/qsort.c @@ -20,6 +20,9 @@ #include <stdlib.h> #include <string.h> +extern void _quicksort __P ((void *const pbase, size_t total_elems, + size_t size, __compar_fn_t cmp)); + /* Byte-wise swap two items of size SIZE. */ #define SWAP(a, b, size) \ do \ |