Fix an include file problem that prevented RTHeapDepC.c from

compiling on post-lite2-merge systems.

1 files changed, 30 insertions, 14 deletions

diff --git a/lang/modula-3-lib/files/patch-ab b/lang/modula-3-lib/files/patch-ab
index 20c60dd545e2..c1a6d48e2e3c 100644
--- a/lang/modula-3-lib/files/patch-ab
+++ b/lang/modula-3-lib/files/patch-ab
@@ -1,10 +1,26 @@
 Fix a const-related compiler warning produced by the "execve" wrapper.
-Also, move network related wrappers to separate files, for SOCKS support.
+Move network related wrappers to separate files, for SOCKS support.
+Fix some things so that it will compile under FreeBSD-3.0.
 
 Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
 --- RTHeapDepC.c.orig	Sat Mar 23 14:52:21 1996
-+++ RTHeapDepC.c	Tue Oct  8 14:31:15 1996
-@@ -110,20 +110,6 @@
++++ RTHeapDepC.c	Wed Mar 26 10:19:53 1997
+@@ -92,6 +92,14 @@
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+ 
++#if __FreeBSD__ >= 3
++#include <sys/time.h>
++#include <nfs/rpcv2.h>
++#include <nfs/nfsproto.h>
++#include <nfs/nfs.h>
++#include <ufs/ufs/ufsmount.h>
++#endif
++
+ #ifdef   NULL
+ #undef   NULL
+ #endif
+@@ -110,20 +118,6 @@
  /* Unless otherwise noted, all the following wrappers have the same
     structure. */
  
@@ -25,7 +41,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int access(path, mode)   /* ok */
  char *path;
  int mode;
-@@ -228,19 +214,6 @@
+@@ -228,19 +222,6 @@
  }
  */
  
@@ -45,7 +61,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  /* not implemented
  int cachectl(addr, nbytes, op)
  char *addr;
-@@ -314,19 +287,6 @@
+@@ -314,19 +295,6 @@
    return result;
  }
  
@@ -65,7 +81,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  /* not implemented (obsolete)
  int creat(name, mode)   
  const char *name;
-@@ -356,8 +316,8 @@
+@@ -356,8 +324,8 @@
      result = syscall(SYS_execve, name, argv, envp);
      if (result == -1 && errno == EFAULT) {
        MAKE_READABLE(name);
@@ -76,7 +92,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
      } else {
        return result;
      }
-@@ -513,20 +473,6 @@
+@@ -513,20 +481,6 @@
  }
  */
  
@@ -97,7 +113,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int getrlimit(resource, rlp)   /* ok */
  int resource;
  struct rlimit *rlp;
-@@ -551,20 +497,6 @@
+@@ -551,20 +505,6 @@
    return result;
  }
  
@@ -118,7 +134,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int getsockopt(s, level, optname, optval, optlen)   /* ok */
  int s, level, optname;
  void *optval;
-@@ -821,19 +753,6 @@
+@@ -821,19 +761,6 @@
    return result;
  }
  
@@ -138,7 +154,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int readlink(path, buf, bufsiz)   /* ok */
  char *path;
  char *buf;
-@@ -865,46 +784,6 @@
+@@ -865,46 +792,6 @@
    return result;
  }
  
@@ -185,7 +201,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int recvmsg(s, msg, flags)   /* ok */
  int s;
  struct msghdr msg[];
-@@ -950,24 +829,6 @@
+@@ -950,24 +837,6 @@
    return result;
  }
  
@@ -210,7 +226,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int semctl(semid, semnum, cmd, arg)   /* ok ? */
  int semid, cmd;
  int semnum;
-@@ -1012,24 +873,6 @@
+@@ -1012,24 +881,6 @@
    return result;
  }
  
@@ -235,7 +251,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int sendmsg(s, msg, flags)   /* ok */
  int s;
  const struct msghdr msg[];
-@@ -1051,27 +894,6 @@
+@@ -1051,27 +902,6 @@
    return result;
  }
  
@@ -263,7 +279,7 @@ Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
  int setdomainname(name, namelen)   /* ok */
  char *name;
  int namelen;
-@@ -1414,19 +1236,6 @@
+@@ -1414,19 +1244,6 @@
    ENTER_CRITICAL;
    MAKE_WRITABLE(status);
    result = syscall(SYS_wait4, pid, status, options, NULL);