From 6ff2606c085a85729875c75af6e48b0adc2f28b8 Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 19 Jan 2015 19:57:59 +0000 Subject: [PATCH] Move doaccept() declaration from its .c file to sys/socketvar.h for use by compat/linux --- sys/kern/uipc_syscalls.c | 4 +--- sys/sys/socketvar.h | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index bddd412f550..1d5a7aecd6e 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.98 2015/01/19 19:47:29 guenther Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.99 2015/01/19 19:57:59 guenther Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -64,8 +64,6 @@ extern struct fileops socketops; int copyaddrout(struct proc *, struct mbuf *, struct sockaddr *, socklen_t, socklen_t *); -int doaccept(struct proc *, int, struct sockaddr *, socklen_t *, int, - register_t *); int sys_socket(struct proc *p, void *v, register_t *retval) diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 2ad83b1fbeb..f1a4278a223 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: socketvar.h,v 1.57 2014/11/03 17:20:46 bluhm Exp $ */ +/* $OpenBSD: socketvar.h,v 1.58 2015/01/19 19:57:59 guenther Exp $ */ /* $NetBSD: socketvar.h,v 1.18 1996/02/09 18:25:38 christos Exp $ */ /*- @@ -324,6 +324,8 @@ int sockargs(struct mbuf **, const void *, size_t, int); int sendit(struct proc *, int, struct msghdr *, int, register_t *); int recvit(struct proc *, int, struct msghdr *, caddr_t, register_t *); +int doaccept(struct proc *, int, struct sockaddr *, socklen_t *, int, + register_t *); #ifdef SOCKBUF_DEBUG void sblastrecordchk(struct sockbuf *, const char *); -- 2.20.1