From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Apr 2014 20:54:31 +0000 (-0400)
Subject: Fix OSX compilation.
X-Git-Tag: tor-0.2.5.4-alpha~41^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c00c45fee133cbb21f69321fa7715a9f7d91164d;p=thirdparty%2Ftor.git

Fix OSX compilation.
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f294842177..a8ad9ec2e2 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1391,6 +1391,7 @@ get_pf_socket(void)
 }
 #endif
 
+#if defined(TRANS_NETFILTER) || defined(TRANS_PF)
 /** Try fill in the address of <b>req</b> from the socket configured
  * with <b>conn</b>. */
 static int
@@ -1426,7 +1427,9 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req)
 
   return 0;
 }
+#endif
 
+#ifdef TRANS_PF
 static int
 destination_from_pf(entry_connection_t *conn, socks_request_t *req)
 {
@@ -1507,6 +1510,7 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req)
 
   return 0;
 }
+#endif
 
 /** Fetch the original destination address and port from a
  * system-specific interface and put them into a