summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-15 11:59:37 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-15 11:59:37 -0500
commit26fcb4bb8c9d3f994a678b641db7b1c91fad8346 (patch)
tree1fdec31af8435f9be718edbbb8463dc361b3533d /src/or
parent3ef40f69937abc105877189fbecd78df67dd2d8e (diff)
parent4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d (diff)
downloadtor-26fcb4bb8c9d3f994a678b641db7b1c91fad8346.tar.gz
tor-26fcb4bb8c9d3f994a678b641db7b1c91fad8346.zip
Merge remote-tracking branch 'sebastian/bug4469'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index bf39a5cb9c..a52bf48078 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -996,6 +996,8 @@ connection_create_listener(const struct sockaddr *listensockaddr,
tor_close_socket(s);
goto err;
}
+#else
+ (void)options;
#endif /* HAVE_SYS_UN_H */
} else {
log_err(LD_BUG,"Got unexpected address family %d.",