diff options
Diffstat (limited to 'lib/libc/stdlib/merge.c')
| -rw-r--r-- | lib/libc/stdlib/merge.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 083a964..2fb1f3a 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * Hybrid exponential search/linear search merge sort with hybrid @@ -98,12 +100,12 @@ int mergesort(base, nmemb, size, cmp) void *base; size_t nmemb; - register size_t size; + size_t size; int (*cmp) __P((const void *, const void *)); { - register int i, sense; + int i, sense; int big, iflag; - register u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; + u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *list2, *list1, *p2, *p, *last, **p1; if (size < PSIZE / 2) { /* Pointers must fit into 2 * size. */ |
