From 40d5a1dea3a83fcc3ad4e9d3617ff71ebe3f83cd Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
Date: Wed, 20 Jun 2012 21:17:25 -0300
Subject: [PATCH] Remove an unused variable ifndef INET_IPV6 (cherry picked
 from commit 40ddff10964905b3d63b9e1d7ed6d045c2db6dab)

---
 upnp/src/genlib/miniserver/miniserver.c | 18 +++++++++++-------
 upnp/src/ssdp/ssdp_device.c             |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/upnp/src/genlib/miniserver/miniserver.c b/upnp/src/genlib/miniserver/miniserver.c
index af310ca..eae6eca 100644
--- a/upnp/src/genlib/miniserver/miniserver.c
+++ b/upnp/src/genlib/miniserver/miniserver.c
@@ -502,10 +502,14 @@ static int get_miniserver_sockets(
 	MiniServerSockArray *out,
 	/*! [in] port on which the server is listening for incoming IPv4
 	 * connections. */
-	uint16_t listen_port4,
+	uint16_t listen_port4
+#ifdef UPNP_ENABLE_IPV6
+	,
 	/*! [in] port on which the server is listening for incoming IPv6
 	 * connections. */
-	uint16_t listen_port6)
+	uint16_t listen_port6
+#endif
+	)
 {
 	char errorBuffer[ERROR_BUFFER_LEN];
 	struct sockaddr_storage __ss_v4;
@@ -760,10 +764,6 @@ static int get_miniserver_sockets(
 	out->miniServerSock4 = listenfd4;
 #ifdef UPNP_ENABLE_IPV6
 	out->miniServerSock6 = listenfd6;
-#else
-	/* Silence compiler warning message:
-	 * warning: unused parameter ‘listen_port6’ */
-	listen_port6 = 0u;
 #endif
 	return UPNP_E_SUCCESS;
 }
@@ -868,7 +868,11 @@ int StartMiniServer(
 #ifdef INTERNAL_WEB_SERVER
 	/* V4 and V6 http listeners. */
 	ret_code = get_miniserver_sockets(
-		miniSocket, *listen_port4, *listen_port6);
+		miniSocket, *listen_port4
+#ifdef UPNP_ENABLE_IPV6
+		, *listen_port6
+#endif
+		);
 	if (ret_code != UPNP_E_SUCCESS) {
 		free(miniSocket);
 		return ret_code;
diff --git a/upnp/src/ssdp/ssdp_device.c b/upnp/src/ssdp/ssdp_device.c
index d00efb5..c3dbc1f 100644
--- a/upnp/src/ssdp/ssdp_device.c
+++ b/upnp/src/ssdp/ssdp_device.c
@@ -186,7 +186,9 @@ static int NewRequestHandler(
 	unsigned long replyAddr = inet_addr(gIF_IPV4);
 	/* a/c to UPNP Spec */
 	int ttl = 4;
+#ifdef INET_IPV6
 	int hops = 1;
+#endif
 	char buf_ntop[INET6_ADDRSTRLEN];
 	int ret = UPNP_E_SUCCESS;