From: Sebastian Hahn <sebastian@torproject.org>
Date: Tue, 14 Feb 2012 20:53:50 +0000 (+0100)
Subject: Include compat.h from natpmp-helper to fix build
X-Git-Tag: tor-0.2.3.13-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19b4df0d46a15c72411b2ce9a03138c94c484104;p=thirdparty%2Ftor.git

Include compat.h from natpmp-helper to fix build

This means tor_socket_t is declared.
---

diff --git a/changes/bug4955 b/changes/bug4955
new file mode 100644
index 0000000000..60896ae11a
--- /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 ed79fd2521..eb739db7fc 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"