nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.7'

Browse Source
This commit is contained in:
Nick Mathewson 2015-09-29 13:51:08 +02:00
commit 003462432b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/test_address.c
View File

@ -781,7 +781,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
static int called_get_interface_addresses_raw = 0; static int called_get_interface_addresses_raw = 0;
smartlist_t * static smartlist_t *
mock_get_interface_addresses_raw_fail(int severity) mock_get_interface_addresses_raw_fail(int severity)
{ {
(void)severity; (void)severity;
@ -792,7 +792,7 @@ mock_get_interface_addresses_raw_fail(int severity)
static int called_get_interface_address6_via_udp_socket_hack = 0; static int called_get_interface_address6_via_udp_socket_hack = 0;
int static int
mock_get_interface_address6_via_udp_socket_hack_fail(int severity, mock_get_interface_address6_via_udp_socket_hack_fail(int severity,
sa_family_t family, sa_family_t family,
tor_addr_t *addr) tor_addr_t *addr)