From 44d7373b600120596526f3f17ed1bce2360c7847 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 24 Sep 2009 14:39:28 +0000
Subject: [PATCH] (trunk third-party) get miniupnpc building again.  the
 breakage has been reported upstream @
 http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1452#1452

---
 third-party/miniupnp/miniupnpc.c | 3 ++-
 third-party/miniupnp/miniwget.c  | 2 ++
 third-party/miniupnp/minixml.c   | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/third-party/miniupnp/miniupnpc.c b/third-party/miniupnp/miniupnpc.c
index 029b5db9f..5db973f08 100644
--- a/third-party/miniupnp/miniupnpc.c
+++ b/third-party/miniupnp/miniupnpc.c
@@ -34,6 +34,7 @@
 #else
 /* Standard POSIX includes */
 #include <unistd.h>
+#include <sys/select.h> /* fd_set */
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -697,7 +698,7 @@ int ReceiveData(int socket, char * data, int length, int timeout)
 	return n;
 }
 
-int
+static int
 UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
 {
 	char status[64];
diff --git a/third-party/miniupnp/miniwget.c b/third-party/miniupnp/miniwget.c
index f36f4007e..8f884d16f 100644
--- a/third-party/miniupnp/miniwget.c
+++ b/third-party/miniupnp/miniwget.c
@@ -20,6 +20,7 @@
 #else
 #include <unistd.h>
 #include <sys/param.h>
+#include <sys/select.h> /* fd_set */
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -33,6 +34,7 @@
 #endif
 
 #include "miniupnpcstrings.h"
+#include "miniwget.h"
 
 /* miniwget2() :
  * */
diff --git a/third-party/miniupnp/minixml.c b/third-party/miniupnp/minixml.c
index dce690e2e..c2310b280 100644
--- a/third-party/miniupnp/minixml.c
+++ b/third-party/miniupnp/minixml.c
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* parseatt : used to parse the argument list
  * return 0 (false) in case of success and -1 (true) if the end
  * of the xmlbuffer is reached. */
-int parseatt(struct xmlparser * p)
+static int parseatt(struct xmlparser * p)
 {
 	const char * attname;
 	int attnamelen;
@@ -106,7 +106,7 @@ int parseatt(struct xmlparser * p)
 
 /* parseelt parse the xml stream and
  * call the callback functions when needed... */
-void parseelt(struct xmlparser * p)
+static void parseelt(struct xmlparser * p)
 {
 	int i;
 	const char * elementname;