Merge branch 'master' into next

This commit is contained in:
Steel Titanium 2020-07-06 12:13:00 -04:00
commit 7d00255dc4

View file

@ -108,7 +108,7 @@ int TimeFunction(int requested_frequency);
#endif
#endif
#if (defined (__unix__) && !defined (_MSDOS)) || defined (UNIXCOMMON)
#if (defined (__unix__) && !defined (_MSDOS)) || (defined (UNIXCOMMON) && !defined(__APPLE__))
#include <errno.h>
#include <sys/wait.h>
#define NEWSIGNALHANDLER