diff options
Diffstat (limited to 'src/lib/libc/stdlib/merge.c')
-rw-r--r-- | src/lib/libc/stdlib/merge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c index 0a1015ad9d..345eb2fd8b 100644 --- a/src/lib/libc/stdlib/merge.c +++ b/src/lib/libc/stdlib/merge.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #if defined(LIBC_SCCS) && !defined(lint) | 37 | #if defined(LIBC_SCCS) && !defined(lint) |
38 | static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $"; | 38 | static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; |
39 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
40 | 40 | ||
41 | /* | 41 | /* |
@@ -99,7 +99,7 @@ mergesort(base, nmemb, size, cmp) | |||
99 | void *base; | 99 | void *base; |
100 | size_t nmemb; | 100 | size_t nmemb; |
101 | register size_t size; | 101 | register size_t size; |
102 | int (*cmp) __P((const void *, const void *)); | 102 | int (*cmp)(const void *, const void *); |
103 | { | 103 | { |
104 | register int i, sense; | 104 | register int i, sense; |
105 | int big, iflag; | 105 | int big, iflag; |
@@ -257,7 +257,7 @@ COPY: b = t; | |||
257 | void | 257 | void |
258 | setup(list1, list2, n, size, cmp) | 258 | setup(list1, list2, n, size, cmp) |
259 | size_t n, size; | 259 | size_t n, size; |
260 | int (*cmp) __P((const void *, const void *)); | 260 | int (*cmp)(const void *, const void *); |
261 | u_char *list1, *list2; | 261 | u_char *list1, *list2; |
262 | { | 262 | { |
263 | int i, length, size2, tmp, sense; | 263 | int i, length, size2, tmp, sense; |
@@ -332,7 +332,7 @@ static void | |||
332 | insertionsort(a, n, size, cmp) | 332 | insertionsort(a, n, size, cmp) |
333 | u_char *a; | 333 | u_char *a; |
334 | size_t n, size; | 334 | size_t n, size; |
335 | int (*cmp) __P((const void *, const void *)); | 335 | int (*cmp)(const void *, const void *); |
336 | { | 336 | { |
337 | u_char *ai, *s, *t, *u, tmp; | 337 | u_char *ai, *s, *t, *u, tmp; |
338 | int i; | 338 | int i; |