--- rtime_srv.c	2003-02-11 01:23:49.000000000 +0000
+++ ../rtime_srv.c	2003-02-11 01:27:07.000000000 +0000
@@ -3,8 +3,8 @@
 #include <netinet/in.h>
 #include <assert.h>
 #include <sys/time.h>
-#include "lwp.h"
-#include "rpc2.h"
+#include <lwp/lwp.h>
+#include <rpc2/rpc2.h>
 #include "rtime.h"
 
 
@@ -23,10 +23,10 @@
 
   /* loop forever, wait for the client to call for service */
   for ( ; ; ) {
-      rc = RPC2_GetRequest(&reqfilter, &cid, &reqbuffer, NULL, NULL, NULL) ;
+      rc = RPC2_GetRequest(&reqfilter, &cid, &reqbuffer, NULL, NULL, NULL, NULL) ;
       if (rc != RPC2_SUCCESS) 
           fprintf(stderr, RPC2_ErrorMsg(rc));
-      rc = rtime_ExecuteRequest(cid, reqbuffer);
+      rc = rtime_ExecuteRequest(cid, reqbuffer,NULL);
       if (rc != RPC2_SUCCESS)
           fprintf(stderr, RPC2_ErrorMsg(rc));
   };
@@ -43,7 +43,7 @@
 Init_RPC()
 {
   PROCESS mylpid;
-  RPC2_PortalIdent pid, *pids;
+  RPC2_PortIdent pid, *pids;
   RPC2_SubsysIdent sid;
   int rc;
   char msg[100];
@@ -54,9 +54,9 @@
 
   /* Initialize RPC2 package */
   pids = &pid;
-  pid.Tag = RPC2_PORTALBYINETNUMBER;
+  pid.Tag = RPC2_PORTBYINETNUMBER;
   pid.Value.InetPortNumber = htons(RTIMEPORTAL);
-  rc = RPC2_Init(RPC2_VERSION, NULL, &pids, 1, -1, NULL);
+  rc = RPC2_Init(RPC2_VERSION,0,pids,-1, NULL);
   if (rc != RPC2_SUCCESS) {
       sprintf(msg, "%s\nCan't Initialize RPC2", RPC2_ErrorMsg(rc));
       error_report(msg);
@@ -73,8 +73,8 @@
 
 long GetRTime(_cid, tv_sec, tv_usec) 
 RPC2_Handle _cid;
-int *tv_sec;
-int *tv_usec;
+RPC2_Integer *tv_sec;
+RPC2_Integer *tv_usec;
 {
   struct timeval tp;
   struct timezone tzp;