More compilation tweaks on Android: fix two clear errors in our code that apparently the compiler cares about there.

svn:r17808
This commit is contained in:
Nick Mathewson
2008-12-29 04:01:58 +00:00
parent dce4677503
commit 2c4097e99d
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -102,7 +102,7 @@
#endif
#ifdef HAVE_NETINET_IN6_H
#include <netinet6/in6.h>
#include <netinet/in6.h>
#endif
#ifdef WIN32
+2 -2
View File
@@ -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;