Index: head/lang/pm3-base/files/patch-l1 =================================================================== --- head/lang/pm3-base/files/patch-l1 (revision 79366) +++ head/lang/pm3-base/files/patch-l1 (revision 79367) @@ -1,38 +1,50 @@ --- libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c.orig Wed May 31 13:54:33 2000 -+++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Fri Nov 23 22:45:32 2001 ++++ libs/m3core/src/runtime/FreeBSD4/RTHeapDepC.c Tue Feb 18 09:33:53 2003 @@ -98,7 +98,11 @@ #include #include #include +#if __FreeBSD_version >= 500023 +#include +#else #include +#endif #include #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; Property changes on: head/lang/pm3-base/files/patch-l1 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/lang/pm3-base/files/patch-l2 =================================================================== --- head/lang/pm3-base/files/patch-l2 (revision 79366) +++ head/lang/pm3-base/files/patch-l2 (revision 79367) @@ -1,38 +1,50 @@ ---- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig Wed May 31 13:54:24 2000 -+++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Fri Nov 23 22:37:31 2001 +--- libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c.orig Wed May 31 10:54:24 2000 ++++ libs/m3core/src/runtime/FBSD_ALPHA/RTHeapDepC.c Sun Apr 20 12:21:15 2003 @@ -98,7 +98,11 @@ #include #include #include +#if __FreeBSD_version >= 500023 +#include +#else #include +#endif #include #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; Property changes on: head/lang/pm3-base/files/patch-l2 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property