Merge remote-tracking branch 'catalyst-github/fix-macos-includes'

src/common/compat.c

@@ -60,9 +60,6 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#ifdef HAVE_CRT_EXTERNS_H
-#include <crt_externs.h>
-#endif
 #ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #endif

src/lib/process/env.c

@@ -18,6 +18,10 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_CRT_EXTERNS_H
+/* For _NSGetEnviron on macOS */
+#include <crt_externs.h>
+#endif
 
 #ifndef HAVE__NSGETENVIRON
 #ifndef HAVE_EXTERN_ENVIRON_DECLARED

src/lib/string/compat_string.c

@@ -15,6 +15,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 
 /** Helper for tor_strtok_r_impl: Advances cp past all characters in
  * <b>sep</b>, and returns its new value. */

src/lib/time/compat_time.c

@@ -16,6 +16,7 @@
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/intmath/muldiv.h"
+#include "lib/intmath/bits.h"
 #include "lib/fs/winlib.h"
 #include "lib/wallclock/timeval.h"
 

src/lib/time/tvdiff.c

@@ -11,6 +11,9 @@
 #ifdef _WIN32
 #include <winsock2.h>
 #endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 
 #define TOR_USEC_PER_SEC 1000000