Changeset 574

Timestamp:

Mar 7, 2022, 7:07:37 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #462 (compile issues on MacOS).

Location:

trunk/src

Files:

• sh_mounts.c (modified) (3 diffs)
• sh_processcheck.c (modified) (2 diffs)
• sh_restrict.c (modified) (1 diff)

trunk/src/sh_mounts.c

@@ -398 +398 @@
 
 /* FreeBSD includes */
-#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) 
+#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
 #include <sys/param.h>
 #include <sys/ucred.h>
@@ -572 +572 @@
 
 /* end AIX helper routines */
-#endif
-#endif
-
-#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD)
+#endif 
+#endif
+
+#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
 
 /* FreeBSD returns flags instead of strings as mount options, so we'll convert
@@ -683 +683 @@
 
 /* The Open/FreeBSD way */
-#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD)
+#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
 {
         struct statfs *fsp;

trunk/src/sh_processcheck.c

@@ -752 +752 @@
 #endif
 
-#if !defined(sun) && !defined(__sun) && !defined(__sun__)
+#if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__) && !defined(__APPLE__)
 #ifdef _POSIX_PRIORITY_SCHEDULING
   struct sched_param p;
@@ -786 +786 @@
 
   /* sched_getparam() is broken on solaris 10, may segfault in librt
+   * also not on MacOS
    */
-#if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__)
+#if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__) && !defined(__APPLE__)
 #ifdef _POSIX_PRIORITY_SCHEDULING
   if (0 == sched_getparam (pid, &p))

trunk/src/sh_restrict.c

@@ -604 +604 @@
   CuAssertPtrNotNull(tc, sh_restrict_list);
 
-#if !defined(HOST_IS_CYGWIN)
+#if !defined(HOST_IS_CYGWIN) && !defined(HOST_IS_DARWIN)
   res = sh_restrict_this("/bin/sh", 1000, 0755, fd);
   CuAssertIntEquals(tc,1,res);