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/xdr.h | |
| parent | 3be3c101574f9fe0620458248e957eda1de7b9a9 (diff) | |
| download | FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.zip FreeBSD-src-db46899f5a13e95008c91bac22a351084b5cd7d1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'include/rpc/xdr.h')
| -rw-r--r-- | include/rpc/xdr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 8ea909b..aab60d9 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -28,7 +28,7 @@ * * from: @(#)xdr.h 1.19 87/04/22 SMI * from: @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC - * $Id: xdr.h,v 1.8 1997/05/07 02:27:11 eivind Exp $ + * $Id: xdr.h,v 1.5 1996/12/30 13:59:41 peter Exp $ */ /* @@ -252,6 +252,7 @@ extern bool_t xdr_bytes __P((XDR *, char **, u_int *, u_int)); extern bool_t xdr_opaque __P((XDR *, caddr_t, u_int)); extern bool_t xdr_string __P((XDR *, char **, u_int)); extern bool_t xdr_union __P((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t)); +extern unsigned long xdr_sizeof __P((xdrproc_t, void *)); extern bool_t xdr_char __P((XDR *, char *)); extern bool_t xdr_u_char __P((XDR *, u_char *)); extern bool_t xdr_vector __P((XDR *, char *, u_int, u_int, xdrproc_t)); |
