diff options
| author | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
| commit | f8ffb57bc4430ff9bbd7560eecdda4284b2799ba (patch) | |
| tree | 7b73b0bf39d756c31bb62dbcd3c239864a6a46c8 /src/common/compat.h | |
| parent | debd7862bb6d641c13fe4ee019da633c683d740e (diff) | |
| parent | 33df3e37ffecfed309a1a0f210a96620c0ebb837 (diff) | |
| download | tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.tar.gz tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.zip | |
Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
Conflicts:
src/or/connection_edge.c
Merged in favour of origin.
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 7001361af3..04e8cb267c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -1,6 +1,6 @@ /* Copyright (c) 2003-2004, Roger Dingledine * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2014, The Tor Project, Inc. */ + * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #ifndef TOR_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); |