diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/configure.in b/configure.in index b723f610f7..ef05d7bbfa 100644 --- a/configure.in +++ b/configure.in @@ -555,9 +555,12 @@ dnl There are no packages for Debian or Redhat as of this patch if test "$natpmp" = "true"; then AC_DEFINE(NAT_PMP, 1, [Define to 1 if we are building with nat-pmp.]) - TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp], - [#include <natpmp.h>], + TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI], [#include <natpmp.h>], + [#ifdef MS_WINDOWS + #define STATICLIB + #endif + #include <natpmp.h>], [ int r; natpmp_t natpmp; natpmpresp_t response; diff --git a/src/tools/tor-fw-helper/Makefile.am b/src/tools/tor-fw-helper/Makefile.am index 8f64ad2ba3..393562db03 100644 --- a/src/tools/tor-fw-helper/Makefile.am +++ b/src/tools/tor-fw-helper/Makefile.am @@ -15,7 +15,7 @@ noinst_HEADERS = \ if NAT_PMP nat_pmp_ldflags = @TOR_LDFLAGS_libnatpmp@ -nat_pmp_ldadd = -lnatpmp +nat_pmp_ldadd = -lnatpmp @TOR_LIB_IPHLPAPI@ nat_pmp_cppflags = @TOR_CPPFLAGS_libnatpmp@ else nat_pmp_ldflags = 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 f9d5d0d586..aaa685e1ee 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -9,11 +9,13 @@ #include "orconfig.h" #ifdef NAT_PMP +#ifdef MS_WINDOWS +#define STATICLIB +#endif #include <stdint.h> #include <stdio.h> #include <string.h> #include <errno.h> -#include <arpa/inet.h> // debugging stuff #include <assert.h> @@ -82,7 +84,7 @@ tor_natpmp_cleanup(tor_fw_options_t *tor_fw_options, void *backend_state) /** Use select() to wait until we can read on fd. */ static int -wait_until_fd_readable(int fd, struct timeval *timeout) +wait_until_fd_readable(unsigned int fd, struct timeval *timeout) { int r; fd_set fds; |