[vino/gnome-3-6] Fixups for -Wmissing-prototypes with miniupnp

[David King <davidk src gnome org>]

commit 0bd8ccb93152bdd8f2287c92f27b3a5c0a0c6a73
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Nov 10 16:58:03 2012 -0500

    Fixups for -Wmissing-prototypes with miniupnp
    
    Fix up a couple of cases of now-fatal missing prototypes either by
    appropriately marking functions as 'static' or including the proper
    headers.

 server/miniupnp/miniupnpc.c |    2 +-
 server/miniupnp/miniwget.c  |    3 +++
 server/miniupnp/minixml.c   |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/server/miniupnp/miniupnpc.c b/server/miniupnp/miniupnpc.c
index 6b97d79..f9d620e 100644
--- a/server/miniupnp/miniupnpc.c
+++ b/server/miniupnp/miniupnpc.c
@@ -618,7 +618,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/server/miniupnp/miniwget.c b/server/miniupnp/miniwget.c
index d627e92..f978816 100644
--- a/server/miniupnp/miniwget.c
+++ b/server/miniupnp/miniwget.c
@@ -5,6 +5,9 @@
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
+
+#include "miniwget.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/miniupnp/minixml.c b/server/miniupnp/minixml.c
index dce690e..c2310b2 100644
--- a/server/miniupnp/minixml.c
+++ b/server/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;