nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix macOS includes

Browse Source 
Recent code movement from refactoring missed some includes that seem
to be necessary on macOS.
This commit is contained in:
Taylor Yu 2018-06-28 17:15:53 -05:00
parent be40ad51b6
commit f9e22c68a0
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/compat.c
View File

@ -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

4
src/lib/process/env.c
View File

@ -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

1
src/lib/string/compat_string.c
View File

@ -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. */

1
src/lib/time/compat_time.c
View File

@ -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"

3
src/lib/time/tvdiff.c
View File

@ -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