From c278c4dbcd0fc89f7baee4c82676e9deef780528 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Mon, 20 May 2024 10:26:12 -0400
Subject: Fix bad confict resolution

* Repairs linux build
---
 include/os_darwin.h | 2 ++
 include/os_linux.h  | 1 +
 2 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/os_darwin.h b/include/os_darwin.h
index 465adc4..d5ed1c6 100644
--- a/include/os_darwin.h
+++ b/include/os_darwin.h
@@ -21,6 +21,8 @@
 #include <sys/syslimits.h>
 #endif
 
+#include <wait.h>
+
 extern char **environ;
 #define __environ environ
 
diff --git a/include/os_linux.h b/include/os_linux.h
index aabf1ff..7eb69bd 100644
--- a/include/os_linux.h
+++ b/include/os_linux.h
@@ -4,6 +4,7 @@
 #include <limits.h>
 #include <sys/statvfs.h>
 #include <sys/utsname.h>
+#include <wait.h>
 
 #ifndef PATH_MAX
 #include <linux/limits.h>
-- 
cgit