commit e4cebb76c5577b1a39b752cc694147e929662c4a Author: Sebastian Hahn sebastian@torproject.org Date: Sat Dec 10 03:25:40 2011 +0100

Fix compilation of natpmp-helper on non-windows

Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b. --- changes/bug4691 | 4 ++++ src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/changes/bug4691 b/changes/bug4691 new file mode 100644 index 0000000..124b8f8 --- /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 aaa685e..2380b14 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>