diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/eventdns.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c index cd486caaa1..106e7997f2 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -102,7 +102,7 @@ #endif #ifdef HAVE_NETINET_IN6_H -#include <netinet6/in6.h> +#include <netinet/in6.h> #endif #ifdef WIN32 diff --git a/src/or/or.h b/src/or/or.h index 5f21fea88a..65158ccd14 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2872,8 +2872,8 @@ const char *get_version(void); int config_get_lines(const char *string, config_line_t **result); void config_free_lines(config_line_t *front); -int options_trial_assign(config_line_t *list, int use_defaults, - int clear_first, char **msg); +setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, + int clear_first, char **msg); int resolve_my_address(int warn_severity, or_options_t *options, uint32_t *addr, char **hostname_out); int is_local_addr(const tor_addr_t *addr) ATTR_PURE; |