diff options
| author | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:45:15 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:45:15 +0000 |
| commit | db46899f5a13e95008c91bac22a351084b5cd7d1 (patch) | |
| tree | 5fd284f478e045e9701e047bb8b1dbb0417a483f /include/rpc/svc.h | |
| parent | 3be3c101574f9fe0620458248e957eda1de7b9a9 (diff) | |
| download | FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.zip FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'include/rpc/svc.h')
| -rw-r--r-- | include/rpc/svc.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 3a5ad3b..c6d48b9 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -28,7 +28,7 @@ * * from: @(#)svc.h 1.20 88/02/08 SMI * from: @(#)svc.h 2.2 88/07/29 4.0 RPCSRC - * $Id: svc.h,v 1.10 1997/05/07 02:27:10 eivind Exp $ + * $Id: svc.h,v 1.6 1996/12/30 13:59:40 peter Exp $ */ /* @@ -306,13 +306,15 @@ __END_DECLS */ __BEGIN_DECLS extern SVCXPRT *svctcp_create __P((int, u_int, u_int)); +extern SVCXPRT *svcfd_create __P((int, u_int, u_int)); __END_DECLS /* - * Fd based rpc. + * AF_UNIX socket based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcfd_create __P((int, u_int, u_int)); +extern SVCXPRT *svcunix_create __P((int, u_int, u_int, char *)); +extern SVCXPRT *svcunixfd_create __P((int, u_int, u_int)); __END_DECLS #endif /* !_RPC_SVC_H */ |
