Changeset 8263


Ignore:
Timestamp:
Apr 21, 2009, 1:12:55 AM (13 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r8261 r8263  
    77   + Transfer prioritization
    88   + Option for transfers to specify if they are included in the global bandwidth limits
     9   + Updated UPnP code to miniupnpc-1.3
    910- Mac
    1011   + Requires Mac OS X 10.5 Leopard or newer
  • trunk/third-party/miniupnp/README

    r7837 r8263  
    11MiniUPnP is written by Thomas Bernard.
    22Its homepage is http://miniupnp.free.fr/
    3 This is from miniupnpc-20090129.tar.gz
     3This is from miniupnpc-1.3.tar.gz
  • trunk/third-party/miniupnp/miniwget.c

    r7837 r8263  
    1 /* $Id: miniwget.c,v 1.21 2008/12/18 17:45:18 nanard Exp $ */
     1/* $Id: miniwget.c,v 1.22 2009/02/28 10:36:35 nanard Exp $ */
    22/* Project : miniupnp
    33 * Author : Thomas Bernard
     
    2727#define closesocket close
    2828#endif
    29 /* for MIN() macro : */
    3029#if defined(__sun) || defined(sun)
    31 #include <utility.h>
     30#define MIN(x,y) (((x)<(y))?(x):(y))
    3231#endif
    3332
  • trunk/third-party/miniupnp/upnpcommands.c

    r7837 r8263  
    1 /* $Id: upnpcommands.c,v 1.22 2008/12/18 17:45:18 nanard Exp $ */
     1/* $Id: upnpcommands.c,v 1.24 2009/04/17 21:21:19 nanard Exp $ */
    22/* Project : miniupnp
    33 * Author : Thomas Bernard
    4  * Copyright (c) 2005-2008 Thomas Bernard
     4 * Copyright (c) 2005-2009 Thomas Bernard
    55 * This software is subject to the conditions detailed in the
    66 * LICENCE file provided in this distribution.
     
    1212#include "miniupnpc.h"
    1313
    14 static unsigned int
     14static UNSIGNED_INTEGER
    1515my_atoui(const char * s)
    1616{
    17         return s ? ((unsigned int)strtoul(s, NULL, 0)) : 0;
     17        return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0;
    1818}
    1919
    2020/*
    2121 * */
    22 unsigned int
     22UNSIGNED_INTEGER
    2323UPNP_GetTotalBytesSent(const char * controlURL,
    2424                                        const char * servicetype)
     
    4040/*
    4141 * */
    42 unsigned int
     42UNSIGNED_INTEGER
    4343UPNP_GetTotalBytesReceived(const char * controlURL,
    4444                                                const char * servicetype)
     
    6060/*
    6161 * */
    62 unsigned int
     62UNSIGNED_INTEGER
    6363UPNP_GetTotalPacketsSent(const char * controlURL,
    6464                                                const char * servicetype)
     
    8080/*
    8181 * */
    82 unsigned int
     82UNSIGNED_INTEGER
    8383UPNP_GetTotalPacketsReceived(const char * controlURL,
    8484                                                const char * servicetype)
  • trunk/third-party/miniupnp/upnpcommands.h

    r7837 r8263  
    1 /* $Id: upnpcommands.h,v 1.16 2008/10/14 18:05:28 nanard Exp $ */
     1/* $Id: upnpcommands.h,v 1.17 2009/04/17 21:21:19 nanard Exp $ */
    22/* Miniupnp project : http://miniupnp.free.fr/
    33 * Author : Thomas Bernard
     
    2020#endif
    2121
    22 LIBSPEC unsigned int
     22#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
     23#define UNSIGNED_INTEGER unsigned long long
     24#define STRTOUI strtoull
     25#else
     26#define UNSIGNED_INTEGER unsigned int
     27#define STRTOUI strtoul
     28#endif
     29
     30LIBSPEC UNSIGNED_INTEGER
    2331UPNP_GetTotalBytesSent(const char * controlURL,
    2432                                        const char * servicetype);
    2533
    26 LIBSPEC unsigned int
     34LIBSPEC UNSIGNED_INTEGER
    2735UPNP_GetTotalBytesReceived(const char * controlURL,
    2836                                                const char * servicetype);
    2937
    30 LIBSPEC unsigned int
     38LIBSPEC UNSIGNED_INTEGER
    3139UPNP_GetTotalPacketsSent(const char * controlURL,
    3240                                        const char * servicetype);
    3341
    34 LIBSPEC unsigned int
     42LIBSPEC UNSIGNED_INTEGER
    3543UPNP_GetTotalPacketsReceived(const char * controlURL,
    3644                                        const char * servicetype);
Note: See TracChangeset for help on using the changeset viewer.