Changeset 574 for trunk/src


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_mounts.c

    r482 r574  
    398398
    399399/* FreeBSD includes */
    400 #if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD)
     400#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
    401401#include <sys/param.h>
    402402#include <sys/ucred.h>
     
    572572
    573573/* end AIX helper routines */
    574 #endif
    575 #endif
    576 
    577 #if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD)
     574#endif 
     575#endif
     576
     577#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
    578578
    579579/* FreeBSD returns flags instead of strings as mount options, so we'll convert
     
    683683
    684684/* The Open/FreeBSD way */
    685 #if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD)
     685#if defined(HOST_IS_FREEBSD) || defined(HOST_IS_OPENBSD) || defined(HOST_IS_DARWIN)
    686686{
    687687        struct statfs *fsp;
  • trunk/src/sh_processcheck.c

    r539 r574  
    752752#endif
    753753
    754 #if !defined(sun) && !defined(__sun) && !defined(__sun__)
     754#if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__) && !defined(__APPLE__)
    755755#ifdef _POSIX_PRIORITY_SCHEDULING
    756756  struct sched_param p;
     
    786786
    787787  /* sched_getparam() is broken on solaris 10, may segfault in librt
     788   * also not on MacOS
    788789   */
    789 #if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__)
     790#if !defined(sun) && !defined(__sun) && !defined(__sun__) && !defined(__OpenBSD__) && !defined(__APPLE__)
    790791#ifdef _POSIX_PRIORITY_SCHEDULING
    791792  if (0 == sched_getparam (pid, &p))
  • trunk/src/sh_restrict.c

    r484 r574  
    604604  CuAssertPtrNotNull(tc, sh_restrict_list);
    605605
    606 #if !defined(HOST_IS_CYGWIN)
     606#if !defined(HOST_IS_CYGWIN) && !defined(HOST_IS_DARWIN)
    607607  res = sh_restrict_this("/bin/sh", 1000, 0755, fd);
    608608  CuAssertIntEquals(tc,1,res);
Note: See TracChangeset for help on using the changeset viewer.