Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

1 files changed, 8 insertions, 9 deletions

diff --git a/mdk-stage1/dietlibc/librpc/clnt_raw.c b/mdk-stage1/dietlibc/librpc/clnt_raw.c
index 7479b55d6..52ab64421 100644
--- a/mdk-stage1/dietlibc/librpc/clnt_raw.c
+++ b/mdk-stage1/dietlibc/librpc/clnt_raw.c
@@ -54,7 +54,7 @@ static struct clntraw_private {
 	XDR xdr_stream;
 	char _raw_buf[UDPMSGSIZE];
 	char mashl_callmsg[MCALL_MSG_SIZE];
-	u_int mcnt;
+	unsigned int mcnt;
 } *clntraw_private;
 
 static enum clnt_stat clntraw_call();
@@ -73,14 +73,12 @@ static struct clnt_ops client_ops = {
 	clntraw_control
 };
 
-void svc_getreq();
-
 /*
  * Create a client handle for memory based rpc.
  */
 CLIENT *clntraw_create(prog, vers)
-u_long prog;
-u_long vers;
+unsigned long prog;
+unsigned long vers;
 {
 	register struct clntraw_private *clp = clntraw_private;
 	struct rpc_msg call_msg;
@@ -123,11 +121,11 @@ u_long vers;
 static enum clnt_stat
 clntraw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
 CLIENT *h;
-u_long proc;
+unsigned long proc;
 xdrproc_t xargs;
-caddr_t argsp;
+char* argsp;
 xdrproc_t xresults;
-caddr_t resultsp;
+char* resultsp;
 struct timeval timeout;
 {
 	register struct clntraw_private *clp = clntraw_private;
@@ -202,7 +200,7 @@ static void clntraw_geterr()
 static bool_t clntraw_freeres(cl, xdr_res, res_ptr)
 CLIENT *cl;
 xdrproc_t xdr_res;
-caddr_t res_ptr;
+char* res_ptr;
 {
 	register struct clntraw_private *clp = clntraw_private;
 	register XDR *xdrs = &clp->xdr_stream;
@@ -228,3 +226,4 @@ static bool_t clntraw_control()
 static void clntraw_destroy()
 {
 }
+