3 files changed, 19 insertions, 15 deletions
diff --git a/cpukit/libnetworking/netinet/in_cksum.c b/cpukit/libnetworking/netinet/in_cksum.c
index dd01e6241d..f8707e8b30 100644
--- a/cpukit/libnetworking/netinet/in_cksum.c
+++ b/cpukit/libnetworking/netinet/in_cksum.c
@@ -74,9 +74,9 @@
   {l_util.l = sum; sum = l_util.s[0] + l_util.s[1];  ADDCARRY(sum);}
 
 int
-in_cksum(m, len)
-	register struct mbuf *m;
-	register uint32_t len;
+in_cksum(
+	struct mbuf *m,
+	uint32_t len )
 {
 	register u_short *w;
 	register int32_t sum = 0;
diff --git a/cpukit/librpc/src/rpc/clnt_tcp.c b/cpukit/librpc/src/rpc/clnt_tcp.c
index f1c316fc8f..c3e2312914 100644
--- a/cpukit/librpc/src/rpc/clnt_tcp.c
+++ b/cpukit/librpc/src/rpc/clnt_tcp.c
@@ -65,8 +65,8 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.14 2000/01/27 23
 
 #define MCALL_MSG_SIZE 24
 
-static int	readtcp();
-static int	writetcp();
+static int	readtcp(char *, char*, int);
+static int	writetcp(char *, char*, int);
 
 static enum clnt_stat	clnttcp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
 static void		clnttcp_abort(void);
@@ -489,10 +489,11 @@ clnttcp_destroy(
  */
 static int
 readtcp(
-	struct ct_data *ct,
-	caddr_t buf,
+	char *_ct,
+	char *buf,
 	int len)
 {
+	struct ct_data *ct = (struct ct_data*) _ct;
 	fd_set *fds, readfds;
 	struct timeval start, after, duration, delta, tmp, tv;
 	int r, save_errno;
@@ -564,10 +565,11 @@ readtcp(
 
 static int
 writetcp(
-	struct ct_data *ct,
-	caddr_t buf,
+	char *_ct,
+	char *buf,
 	int len)
 {
+	struct ct_data *ct = (struct ct_data *) _ct;
 	register int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {
diff --git a/cpukit/librpc/src/rpc/svc_tcp.c b/cpukit/librpc/src/rpc/svc_tcp.c
index 6fbe2d6c45..f2bf383e8b 100644
--- a/cpukit/librpc/src/rpc/svc_tcp.c
+++ b/cpukit/librpc/src/rpc/svc_tcp.c
@@ -87,8 +87,8 @@ static struct xp_ops svctcp_rendezvous_op = {
 	svctcp_destroy
 };
 
-static int readtcp(), writetcp();
-static SVCXPRT *makefd_xprt();
+static int readtcp(char *, char*, int), writetcp(char *, char*, int);
+static SVCXPRT *makefd_xprt( int fd, u_int sendsize, u_int recvsize);
 
 struct tcp_rendezvous { /* kept in xprt->xp_p1 */
 	u_int sendsize;
@@ -325,10 +325,11 @@ static struct timeval wait_per_try = { 35, 0 };
  */
 static int
 readtcp(
-	SVCXPRT *xprt,
-	caddr_t buf,
+	char *_xprt,
+	char *buf,
 	int len)
 {
+	SVCXPRT *xprt = (SVCXPRT*) _xprt;
 	register int sock = xprt->xp_sock;
 	struct timeval start, delta, tv;
 	struct timeval tmp1, tmp2;
@@ -393,10 +394,11 @@ fatal_err:
  */
 static int
 writetcp(
-	SVCXPRT *xprt,
-	caddr_t buf,
+	char *_xprt,
+	char *buf,
 	int len)
 {
+	SVCXPRT *xprt = (SVCXPRT *) _xprt;
 	register int i, cnt;
 
 	for (cnt = len; cnt > 0; cnt -= i, buf += i) {