commit 19b4df0d46a15c72411b2ce9a03138c94c484104 Author: Sebastian Hahn sebastian@torproject.org Date: Tue Feb 14 21:53:50 2012 +0100

Include compat.h from natpmp-helper to fix build

This means tor_socket_t is declared. --- changes/bug4955 | 5 +++++ src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/changes/bug4955 b/changes/bug4955 new file mode 100644 index 0000000..60896ae --- /dev/null +++ b/changes/bug4955 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix the build when built with nat-pmp support. Fixes bug 4955; + bugfix on 0.2.3.11-alpha. Reported by Anthony G. Basile + blueness@gentoo.org, thanks! + diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index ed79fd2..eb739db 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -23,6 +23,8 @@ // debugging stuff #include <assert.h>

+#include "compat.h" + #include "tor-fw-helper.h" #include "tor-fw-helper-natpmp.h"