diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-05-20 10:26:12 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-05-20 10:26:12 -0400 |
| commit | c278c4dbcd0fc89f7baee4c82676e9deef780528 (patch) | |
| tree | 593bb9af70cc84fc161f09b774a0f6f500670eff /include | |
| parent | 67975a5944706e382fe1e7b00d226715c6242358 (diff) | |
| download | stasis-c278c4dbcd0fc89f7baee4c82676e9deef780528.tar.gz | |
Fix bad confict resolution
* Repairs linux build
Diffstat (limited to 'include')
| -rw-r--r-- | include/os_darwin.h | 2 | ||||
| -rw-r--r-- | include/os_linux.h | 1 |
2 files changed, 3 insertions, 0 deletions
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> |