diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libc/stdlib/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c index 345eb2fd8b..4ae6488af2 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.4 2002/02/16 21:27:24 millert Exp $"; | 38 | static char *rcsid = "$OpenBSD: merge.c,v 1.5 2002/02/17 19:42:24 millert Exp $"; |
| 39 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
| 40 | 40 | ||
| 41 | /* | 41 | /* |
| @@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $" | |||
| 58 | #include <stdlib.h> | 58 | #include <stdlib.h> |
| 59 | #include <string.h> | 59 | #include <string.h> |
| 60 | 60 | ||
| 61 | static void setup __P((u_char *, u_char *, size_t, size_t, int (*)())); | 61 | static void setup(u_char *, u_char *, size_t, size_t, int (*)()); |
| 62 | static void insertionsort __P((u_char *, size_t, size_t, int (*)())); | 62 | static void insertionsort(u_char *, size_t, size_t, int (*)()); |
| 63 | 63 | ||
| 64 | #define ISIZE sizeof(int) | 64 | #define ISIZE sizeof(int) |
| 65 | #define PSIZE sizeof(u_char *) | 65 | #define PSIZE sizeof(u_char *) |
