--- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig	Wed May 31 13:54:33 2000
+++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c	Tue Feb 18 09:33:53 2003
@@ -98,7 +98,11 @@
 #include <sys/time.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
+#if __FreeBSD_version >= 500023
+#include <nfsclient/nfs.h>
+#else
 #include <nfs/nfs.h>
+#endif
 #include <ufs/ufs/ufsmount.h>
 #endif
 
@@ -693,7 +697,9 @@
   void *data;
 { int result;
   struct ufs_args *u_data;
+#if __FreeBSD_version < 500019
   struct mfs_args *m_data;
+#endif
   struct nfs_args *n_data;
 
   ENTER_CRITICAL;
@@ -704,11 +710,13 @@
     MAKE_READABLE(u_data);
     MAKE_READABLE(u_data->fspec);
     result = syscall(SYS_mount, type, dir, flags, data);
+#if __FreeBSD_version < 500019
   } else if (strcmp(type, "mfs") == 0) {
     m_data = (struct mfs_args*) data;
     MAKE_READABLE(m_data);
     MAKE_READABLE(m_data->fspec);
     result = syscall(SYS_mount, type, dir, flags, data);
+#endif
   } else if (strcmp(type, "nfs") == 0) {
     n_data = (struct nfs_args*) data;
     MAKE_READABLE(n_data);
@@ -805,7 +813,11 @@
 
 int msgsnd(msqid, msgp, msgsz, msgflg)   /* ok */
 int msqid;
+#if __FreeBSD_version >= 500100
+const void *msgp;
+#else
 void *msgp;
+#endif
 size_t msgsz;
 int msgflg;
 { int result;