diff options
| author | Elliott Hughes <enh@google.com> | 2018-11-30 13:31:33 -0800 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2018-11-30 16:38:12 -0600 |
| commit | 890909a6d0ec2fa7f55afd22aa142b4b3d5f156a (patch) | |
| tree | 8c68dc7fdcb3c2aa20339a1425b446aeeaaf09cc | |
| parent | c6ee3c269e06fb0cfa61e759ed84b85e038593c7 (diff) | |
| download | toybox-890909a6d0ec2fa7f55afd22aa142b4b3d5f156a.tar.gz | |
macOS: work around header idiosyncracies.
| -rw-r--r-- | lib/portability.h | 10 | ||||
| -rw-r--r-- | toys.h | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/portability.h b/lib/portability.h index 3f841bac..21d0b8a1 100644 --- a/lib/portability.h +++ b/lib/portability.h @@ -147,7 +147,17 @@ int clearenv(void); // Linux headers not listed by POSIX or LSB #include <sys/mount.h> +#ifdef __linux__ +#include <sys/statfs.h> #include <sys/swap.h> +#include <sys/sysinfo.h> +#endif + +#ifdef __APPLE__ +#include <util.h> +#else +#include <pty.h> +#endif // Android is missing some headers and functions // "generated/config.h" is included first @@ -62,10 +62,7 @@ #include <wctype.h> // LSB 4.1 headers -#include <pty.h> #include <sys/ioctl.h> -#include <sys/statfs.h> -#include <sys/sysinfo.h> #include "lib/lib.h" #include "lib/lsm.h" |