From 890909a6d0ec2fa7f55afd22aa142b4b3d5f156a Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 30 Nov 2018 13:31:33 -0800
Subject: macOS: work around header idiosyncracies.

---
 lib/portability.h | 10 ++++++++++
 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
diff --git a/toys.h b/toys.h
index 0e8d4684..5e71e3fe 100644
--- a/toys.h
+++ b/toys.h
@@ -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"
-- 
cgit v1.2.3