summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/merge.c
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2002-02-16 21:27:05 +0000
committermillert <millert@openbsd.org>2002-02-16 21:27:05 +0000
commitc72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch)
tree1ac67aab11df5f96856c0e3015d691db7dc9e811 /lib/libc/stdlib/merge.c
parentdefault to rsa keyfile path for non key generation operations where (diff)
downloadwireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz
wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
Diffstat (limited to 'lib/libc/stdlib/merge.c')
-rw-r--r--lib/libc/stdlib/merge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 0a1015ad9dd..345eb2fd8ba 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -35,7 +35,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $";
+static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -99,7 +99,7 @@ mergesort(base, nmemb, size, cmp)
void *base;
size_t nmemb;
register size_t size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
register int i, sense;
int big, iflag;
@@ -257,7 +257,7 @@ COPY: b = t;
void
setup(list1, list2, n, size, cmp)
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
u_char *list1, *list2;
{
int i, length, size2, tmp, sense;
@@ -332,7 +332,7 @@ static void
insertionsort(a, n, size, cmp)
u_char *a;
size_t n, size;
- int (*cmp) __P((const void *, const void *));
+ int (*cmp)(const void *, const void *);
{
u_char *ai, *s, *t, *u, tmp;
int i;