From 8c0e2434f5f0d5670425bc836a62258242bd1063 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 25 Oct 2007 13:59:46 +0000
Subject: [PATCH] fix OpenBSD build error.

---
 NEWS                               | 3 ++-
 libtransmission/crypto.c           | 3 ++-
 libtransmission/natpmp.c           | 1 +
 libtransmission/net.c              | 2 ++
 libtransmission/net.h              | 1 -
 libtransmission/peer-io.c          | 3 ++-
 libtransmission/peer-mgr-private.h | 2 +-
 libtransmission/peer-mgr.c         | 4 +++-
 libtransmission/peer-mgr.h         | 2 +-
 libtransmission/peer-msgs.c        | 2 +-
 libtransmission/platform.c         | 1 +
 libtransmission/upnp.c             | 2 ++
 12 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 5ec366e2e..1745555e4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
 NEWS file for Transmission <http://transmission.m0k.org/>
 
 0.91 (2007/xx/xx)
-- libtransmission:
+- libtransmission (all platforms):
    + Fix 0.90 socket connection leak.
+   + Fix 0.90 OpenBSD build error.
 - OS X:
    + Add Dutch localization, Re-add Russian localization, fix Korean localization
 - gtk:
diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index 6acba43d1..95d84a589 100644
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -14,7 +14,8 @@
 #include <inttypes.h> /* uint8_t */
 #include <string.h> /* memcpy */
 #include <stdarg.h>
-#include <arpa/inet.h>
+#include <netinet/in.h> /* struct in_addr */
+
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c
index ec0483f9b..3cb117037 100644
--- a/libtransmission/natpmp.c
+++ b/libtransmission/natpmp.c
@@ -33,6 +33,7 @@
 #endif
 
 #include <sys/types.h>
+#include <arpa/inet.h> /* inet_addr */
 
 #include "transmission.h"
 #include "natpmp.h"
diff --git a/libtransmission/net.c b/libtransmission/net.c
index 259a39f6a..67f6607ca 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -29,6 +29,8 @@
 
 #include <sys/types.h>
 
+#include <arpa/inet.h> /* inet_addr */
+
 #ifndef WIN32
 #include <netdb.h>
 #include <fcntl.h>
diff --git a/libtransmission/net.h b/libtransmission/net.h
index b8ccf8897..fead90c92 100644
--- a/libtransmission/net.h
+++ b/libtransmission/net.h
@@ -38,7 +38,6 @@
 #else
     #include <sys/socket.h>
     #include <netinet/in.h>
-    #include <arpa/inet.h>
     typedef in_port_t tr_port_t;
 #endif
 
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 02ce56788..42af6332e 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -14,7 +14,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <arpa/inet.h>
+#include <netinet/in.h> /* struct in_addr */
+#include <arpa/inet.h> /* inet_ntoa */
 #include <event.h>
 #include "transmission.h"
 #include "crypto.h"
diff --git a/libtransmission/peer-mgr-private.h b/libtransmission/peer-mgr-private.h
index caae49268..f5a70144a 100644
--- a/libtransmission/peer-mgr-private.h
+++ b/libtransmission/peer-mgr-private.h
@@ -14,7 +14,7 @@
 #define TR_PEER_MGR_PRIVATE_H
 
 #include <inttypes.h> /* uint16_t */
-#include <arpa/inet.h> /* struct in_addr */
+#include <netinet/in.h> /* struct in_addr */
 #include "publish.h" /* tr_publisher_tag */
 
 struct tr_bitfield;
diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 2334c2a31..dad3be623 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -15,9 +15,11 @@
 #include <stdlib.h> /* qsort */
 #include <stdio.h> /* printf */
 #include <limits.h> /* INT_MAX */
-#include <libgen.h> /* basename */
 
+#include <libgen.h> /* basename */
 #include <sys/types.h> /* event.h needs this */
+#include <arpa/inet.h> /* inet_ntoa */
+
 #include <event.h>
 
 #include "transmission.h"
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 6ecb061c7..f441f9ce3 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -14,7 +14,7 @@
 #define TR_PEER_MGR_H
 
 #include <inttypes.h> /* uint16_t */
-#include <arpa/inet.h> /* struct in_addr */
+#include <netinet/in.h> /* struct in_addr */
 
 struct in_addr;
 struct tr_handle;
diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 21ec7fd74..7cbc64ded 100644
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <libgen.h> /* basename */
 
-#include <arpa/inet.h>
+#include <netinet/in.h> /* struct in_addr */
 
 #include <sys/types.h> /* event.h needs this */
 #include <event.h>
diff --git a/libtransmission/platform.c b/libtransmission/platform.c
index 616da19c5..e6e63e4e7 100644
--- a/libtransmission/platform.c
+++ b/libtransmission/platform.c
@@ -647,6 +647,7 @@ tr_getTorrentsDirectory( void )
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h> /* struct in_addr */
 #include <sys/sysctl.h>
 #include <net/route.h>
 
diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
index 95539879c..162feee2a 100644
--- a/libtransmission/upnp.c
+++ b/libtransmission/upnp.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <time.h>
 
+#include <arpa/inet.h> /* inet_addr */
+
 #ifdef __BEOS__
     #include <netdb.h>
 #endif