More compilation tweaks on Android: fix two clear errors in our code that apparently...

svn:r17808

diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index cd486caaa135a5af7372dfd4c55bfc69683f17d4..106e7997f22c11be33db43a1b468b37c55e7b771 100644 (file)
--- 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 5f21fea88ab55f037484058c958e0c8820075024..65158ccd145efbe062ddbface6a1645b274a235f 100644 (file)
--- 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;