2005-10-16 08:15:36 +02:00
|
|
|
--- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig Wed May 31 20:54:33 2000
|
|
|
|
+++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Wed Aug 17 11:59:31 2005
|
2001-11-25 03:51:42 +01:00
|
|
|
@@ -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
|
|
|
|
|
2005-10-16 08:15:36 +02:00
|
|
|
@@ -451,7 +455,11 @@
|
|
|
|
|
|
|
|
int gethostname(name, namelen) /* ok */
|
|
|
|
char *name;
|
|
|
|
+#if __FreeBSD__ >= 5
|
|
|
|
+size_t namelen;
|
|
|
|
+#else
|
|
|
|
int namelen;
|
|
|
|
+#endif
|
|
|
|
{ int result;
|
|
|
|
#if __FreeBSD__ >= 2
|
|
|
|
int mib[2];
|
|
|
|
@@ -693,7 +701,9 @@
|
2001-07-21 23:07:55 +02:00
|
|
|
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;
|
2005-10-16 08:15:36 +02:00
|
|
|
@@ -704,11 +714,13 @@
|
2001-07-21 23:07:55 +02:00
|
|
|
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);
|
2005-10-16 08:15:36 +02:00
|
|
|
@@ -805,7 +817,11 @@
|
2003-04-20 21:34:29 +02:00
|
|
|
|
|
|
|
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;
|