aboutsummaryrefslogtreecommitdiff
path: root/sunrpc/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'sunrpc/rpc')
-rw-r--r--sunrpc/rpc/auth_des.h16
-rw-r--r--sunrpc/rpc/xdr.h5
2 files changed, 14 insertions, 7 deletions
diff --git a/sunrpc/rpc/auth_des.h b/sunrpc/rpc/auth_des.h
index 7bb3c59b8e..b94bafb67b 100644
--- a/sunrpc/rpc/auth_des.h
+++ b/sunrpc/rpc/auth_des.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -48,12 +48,19 @@ struct authdes_cred
uint32_t adc_nickname;
};
+/* A timeval replacement for !32bit platforms */
+struct rpc_timeval
+ {
+ uint32_t tv_sec; /* Seconds. */
+ uint32_t tv_usec; /* Microseconds. */
+ };
+
/* A des authentication verifier */
struct authdes_verf
{
union
{
- struct timeval adv_ctime; /* clear time */
+ struct rpc_timeval adv_ctime; /* clear time */
des_block adv_xtime; /* crypt time */
}
adv_time_u;
@@ -96,8 +103,9 @@ extern int getpublickey __P ((__const char *__name, char *__key));
extern int getsecretkey __P ((__const char *__name, char *__key,
__const char *__passwd));
-extern int rtime __P ((struct sockaddr_in *__addrp, struct timeval *__timep,
- struct timeval *__timeout));
+extern int rtime __P ((struct sockaddr_in *__addrp,
+ struct rpc_timeval *__timep,
+ struct rpc_timeval *__timeout));
__END_DECLS
diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h
index 44bad8a337..91dbcc3da3 100644
--- a/sunrpc/rpc/xdr.h
+++ b/sunrpc/rpc/xdr.h
@@ -1,4 +1,3 @@
-/* @(#)xdr.h 2.2 88/07/29 4.0 RPCSRC */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
* unrestricted use provided that this legend is included on all tape
@@ -27,7 +26,6 @@
* 2550 Garcia Avenue
* Mountain View, California 94043
*/
-/* @(#)xdr.h 1.19 87/04/22 SMI */
/*
* xdr.h, External Data Representation Serialization Routines.
@@ -130,7 +128,7 @@ struct XDR
/* returns bytes off from beginning */
bool_t (*x_setpostn) __PMT ((XDR *__xdrs, u_int pos));
/* lets you reposition the stream */
- long *(*x_inline) __PMT ((XDR *__xdrs, int len));
+ int32_t *(*x_inline) __PMT ((XDR *__xdrs, int len));
/* buf quick ptr to buffered data */
void (*x_destroy) __PMT ((XDR *__xdrs));
/* free privates of this xdr_stream */
@@ -162,6 +160,7 @@ typedef bool_t (*xdrproc_t) __PMT ((XDR *, void *,...));
* Operations defined on a XDR handle
*
* XDR *xdrs;
+ * int32_t *int32p;
* long *longp;
* caddr_t addr;
* u_int len;