diff options
| author | dim <dim@FreeBSD.org> | 2015-09-20 20:34:17 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-20 20:34:17 +0000 |
| commit | 18b14b4a2fd66af5fcf07d469fe45b32b2c0be76 (patch) | |
| tree | 6068d0c9297482b6c68c78d37d113e16d44371c0 /lib/libc/stdlib/merge.c | |
| parent | 7b8be099124cf3848a48077ce37206e0ae691839 (diff) | |
| parent | e5a64a53e6f41e1fb2f62f6b0fdfdbe1b7d5f5b0 (diff) | |
| download | FreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.zip FreeBSD-src-18b14b4a2fd66af5fcf07d469fe45b32b2c0be76.tar.gz | |
Merge ^/head r287878 through r288034.
Diffstat (limited to 'lib/libc/stdlib/merge.c')
| -rw-r--r-- | lib/libc/stdlib/merge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 17f07eb..55b3a0c 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -99,6 +99,12 @@ static void insertionsort(u_char *, size_t, size_t, cmp_t); ((u_char *)0 + \ (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))) +#ifdef I_AM_MERGESORT_B +int mergesort_b(void *, size_t, size_t, cmp_t); +#else +int mergesort(void *, size_t, size_t, cmp_t); +#endif + /* * Arguments are as for qsort. */ |
