From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 4 Apr 2008 01:21:36 +0000 (+0000)
Subject: #837: portability patch submitted by naddy
X-Git-Tag: 1.11~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e61af5448137382757a5eb8bb796bf52b8f2271b;p=transmission

#837: portability patch submitted by naddy
---

diff --git a/cli/Makefile.am b/cli/Makefile.am
index e2335e193..c8a6ddbdf 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -12,5 +12,5 @@ transmissioncli_LDADD = \
     $(top_builddir)/third-party/libevent/libevent.la \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a46c00d39..bbe720ae4 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -32,7 +32,7 @@ COMMON_LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
 transmission_daemon_SOURCES = daemon.c server.c torrents.c
 transmission_daemon_LDADD = $(COMMON_LDADD)
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 383f8c1f3..7628a1868 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -90,7 +90,7 @@ APPS_LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/libevent/libevent.la \
-    $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
+    $(INTLLIBS) $(OPENSSL_LIBS) $(PTHREAD_LIBS) -lm
 
 benc2php_SOURCES = benc2php.c
 benc2php_LDADD = $(APPS_LDADD)
diff --git a/libtransmission/net.h b/libtransmission/net.h
index 70920cef2..1ade261cb 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -36,6 +36,7 @@
     typedef unsigned short tr_port_t;
     typedef int socklen_t;
 #else
+    #include <sys/types.h>
     #include <sys/socket.h>
     #include <netinet/in.h>
     #include <arpa/inet.h>