(trunk) upgrade miniupnp to miniupnpc-1.3, which has small portability fixes

NEWS

@@ -6,6 +6,7 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
    + Random port, with optional randomization on startup
    + Transfer prioritization
    + Option for transfers to specify if they are included in the global bandwidth limits
+   + Updated UPnP code to miniupnpc-1.3
 - Mac
    + Requires Mac OS X 10.5 Leopard or newer
    + Groups (moved to preferences) can be auto-assigned to transfers when adding based on multiple criteria

third-party/miniupnp/README

@@ -1,3 +1,3 @@
 MiniUPnP is written by Thomas Bernard.
 Its homepage is http://miniupnp.free.fr/
-This is from miniupnpc-20090129.tar.gz
+This is from miniupnpc-1.3.tar.gz

third-party/miniupnp/miniwget.c

@@ -1,4 +1,4 @@
-/* $Id: miniwget.c,v 1.21 2008/12/18 17:45:18 nanard Exp $ */
+/* $Id: miniwget.c,v 1.22 2009/02/28 10:36:35 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
  * Copyright (c) 2005 Thomas Bernard
@@ -26,9 +26,8 @@
 #include <arpa/inet.h>
 #define closesocket close
 #endif
-/* for MIN() macro : */
 #if defined(__sun) || defined(sun)
-#include <utility.h>
+#define MIN(x,y) (((x)<(y))?(x):(y))
 #endif
 
 #include "miniupnpcstrings.h"

third-party/miniupnp/upnpcommands.c

@@ -1,7 +1,7 @@
-/* $Id: upnpcommands.c,v 1.22 2008/12/18 17:45:18 nanard Exp $ */
+/* $Id: upnpcommands.c,v 1.24 2009/04/17 21:21:19 nanard Exp $ */
 /* Project : miniupnp
  * Author : Thomas Bernard
- * Copyright (c) 2005-2008 Thomas Bernard
+ * Copyright (c) 2005-2009 Thomas Bernard
  * This software is subject to the conditions detailed in the
  * LICENCE file provided in this distribution.
  * */
@@ -11,15 +11,15 @@
 #include "upnpcommands.h"
 #include "miniupnpc.h"
 
-static unsigned int
+static UNSIGNED_INTEGER
 my_atoui(const char * s)
 {
-	return s ? ((unsigned int)strtoul(s, NULL, 0)) : 0;
+	return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0;
 }
 
 /*
  * */
-unsigned int
+UNSIGNED_INTEGER
 UPNP_GetTotalBytesSent(const char * controlURL,
 					const char * servicetype)
 {
@@ -39,7 +39,7 @@ UPNP_GetTotalBytesSent(const char * controlURL,
 
 /*
  * */
-unsigned int
+UNSIGNED_INTEGER
 UPNP_GetTotalBytesReceived(const char * controlURL,
 						const char * servicetype)
 {
@@ -59,7 +59,7 @@ UPNP_GetTotalBytesReceived(const char * controlURL,
 
 /*
  * */
-unsigned int
+UNSIGNED_INTEGER
 UPNP_GetTotalPacketsSent(const char * controlURL,
 						const char * servicetype)
 {
@@ -79,7 +79,7 @@ UPNP_GetTotalPacketsSent(const char * controlURL,
 
 /*
  * */
-unsigned int
+UNSIGNED_INTEGER
 UPNP_GetTotalPacketsReceived(const char * controlURL,
 						const char * servicetype)
 {

third-party/miniupnp/upnpcommands.h

@@ -1,4 +1,4 @@
-/* $Id: upnpcommands.h,v 1.16 2008/10/14 18:05:28 nanard Exp $ */
+/* $Id: upnpcommands.h,v 1.17 2009/04/17 21:21:19 nanard Exp $ */
 /* Miniupnp project : http://miniupnp.free.fr/
  * Author : Thomas Bernard
  * Copyright (c) 2005-2008 Thomas Bernard
@@ -19,19 +19,27 @@
 extern "C" {
 #endif
 
-LIBSPEC unsigned int
+#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#define UNSIGNED_INTEGER unsigned long long
+#define STRTOUI	strtoull
+#else
+#define UNSIGNED_INTEGER unsigned int
+#define STRTOUI	strtoul
+#endif
+
+LIBSPEC UNSIGNED_INTEGER
 UPNP_GetTotalBytesSent(const char * controlURL,
 					const char * servicetype);
 
-LIBSPEC unsigned int
+LIBSPEC UNSIGNED_INTEGER
 UPNP_GetTotalBytesReceived(const char * controlURL,
 						const char * servicetype);
 
-LIBSPEC unsigned int
+LIBSPEC UNSIGNED_INTEGER
 UPNP_GetTotalPacketsSent(const char * controlURL,
 					const char * servicetype);
 
-LIBSPEC unsigned int
+LIBSPEC UNSIGNED_INTEGER
 UPNP_GetTotalPacketsReceived(const char * controlURL,
 					const char * servicetype);