diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-29 10:00:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-29 10:00:34 -0500 |
| commit | e85f0c650c0509ceff777d0a7fafd6c953604ad8 (patch) | |
| tree | 519327dc8872d86669392983c2e2b2459d1c777c /src/common/compat.h | |
| parent | 4d6a971ba94f22a86577840cdf1b4935cd445a9b (diff) | |
| parent | de432d55657ee124bce0e9a4d5f5842088e2e13b (diff) | |
| download | tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.tar.gz tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.zip | |
Merge branch 'resolvemyaddr_squashed'
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 7001361af3..454a516968 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -532,10 +532,11 @@ struct sockaddr_in6 { }; #endif +MOCK_DECL(int,tor_gethostname,(char *name, size_t namelen)); int tor_inet_aton(const char *cp, struct in_addr *addr) ATTR_NONNULL((1,2)); const char *tor_inet_ntop(int af, const void *src, char *dst, size_t len); int tor_inet_pton(int af, const char *src, void *dst); -int tor_lookup_hostname(const char *name, uint32_t *addr) ATTR_NONNULL((1,2)); +MOCK_DECL(int,tor_lookup_hostname,(const char *name, uint32_t *addr)); int set_socket_nonblocking(tor_socket_t socket); int tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]); int network_init(void); |