summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-12-10 03:25:40 +0100
committerSebastian Hahn <sebastian@torproject.org>2011-12-10 03:25:40 +0100
commite4cebb76c5577b1a39b752cc694147e929662c4a (patch)
tree0f07799fbe374503724b87a3884a6dcba20920e2
parentb7519dce98031c2adca3f0c8f28741a219845b6e (diff)
downloadtor-e4cebb76c5577b1a39b752cc694147e929662c4a.tar.gz
tor-e4cebb76c5577b1a39b752cc694147e929662c4a.zip
Fix compilation of natpmp-helper on non-windows
Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b.
-rw-r--r--changes/bug46914
-rw-r--r--src/tools/tor-fw-helper/tor-fw-helper-natpmp.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug4691 b/changes/bug4691
new file mode 100644
index 0000000000..124b8f8ab9
--- /dev/null
+++ b/changes/bug4691
@@ -0,0 +1,4 @@
+ o Major bugfixes:
+ - Fix compilation of the libnatpmp helper on non-Windows. Bugfix on
+ 0.2.3.9-alpha; fixes bug 4691. Reported by Anthony G. Basile.
+
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 aaa685e1ee..2380b141df 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
@@ -16,6 +16,9 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#ifndef MS_WINDOWS
+#include <arpa/inet.h>
+#endif
// debugging stuff
#include <assert.h>