diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-28 18:19:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-28 18:19:53 -0400 |
| commit | f0319fcbde2117098bcef12cc731600fd6a85afe (patch) | |
| tree | aa1fa6d42fd00f1cc1ede1067fc1a978a33a7f08 | |
| parent | 365179cd16b8ccc0986d7a99db2607a95d0932a9 (diff) | |
| parent | f9e22c68a0c701745867a9dac391a70171654c75 (diff) | |
| download | tor-f0319fcbde2117098bcef12cc731600fd6a85afe.tar.gz tor-f0319fcbde2117098bcef12cc731600fd6a85afe.zip | |
Merge remote-tracking branch 'catalyst-github/fix-macos-includes'
| -rw-r--r-- | src/common/compat.c | 3 | ||||
| -rw-r--r-- | src/lib/process/env.c | 4 | ||||
| -rw-r--r-- | src/lib/string/compat_string.c | 1 | ||||
| -rw-r--r-- | src/lib/time/compat_time.c | 1 | ||||
| -rw-r--r-- | src/lib/time/tvdiff.c | 3 |
5 files changed, 9 insertions, 3 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 6d89e1c08b..63bf99de68 100644 --- a/src/common/compat.c +++ b/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 diff --git a/src/lib/process/env.c b/src/lib/process/env.c index 95e1e515d4..731f609ac1 100644 --- a/src/lib/process/env.c +++ b/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 diff --git a/src/lib/string/compat_string.c b/src/lib/string/compat_string.c index 3f8a4d515d..8b063b7242 100644 --- a/src/lib/string/compat_string.c +++ b/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. */ diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 08f99b70c9..2ea6eca988 100644 --- a/src/lib/time/compat_time.c +++ b/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" diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c index 9fb67bcd2d..5dbc0fd19c 100644 --- a/src/lib/time/tvdiff.c +++ b/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 |