diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-06 23:51:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 23:51:34 +0100 |
| commit | d4b31c698056e7b835d49d6700371ca18ca94f8c (patch) | |
| tree | e8c6bdc039898d8cf04c9b38be91f158b16e5c97 /thirdparty | |
| parent | 6635e25b2c2263cc145a3668896da9315cce4d58 (diff) | |
| parent | 0c37c4021b52d2ff8a5e02d5e1668932d8702845 (diff) | |
Merge pull request #36870 from CodeforEvolution/syncMiniupnpc
miniupnpc: Sync with upstream master (4436632)
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/miniupnpc/miniupnpc/minissdpc.c | 4 | ||||
| -rw-r--r-- | thirdparty/miniupnpc/miniupnpc/portlistingparse.c | 7 | ||||
| -rw-r--r-- | thirdparty/miniupnpc/miniupnpc/upnpc.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 8f8d212a82..1c17e2e38d 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -309,7 +309,7 @@ File extracted from upstream release tarball (`-apache.tgz` variant): ## miniupnpc - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc -- Version: git (0ab1d67, 2019) +- Version: git (4436632, 2020) - License: BSD-3-Clause Files extracted from upstream source: diff --git a/thirdparty/miniupnpc/miniupnpc/minissdpc.c b/thirdparty/miniupnpc/miniupnpc/minissdpc.c index ea9af02e1f..36244dedec 100644 --- a/thirdparty/miniupnpc/miniupnpc/minissdpc.c +++ b/thirdparty/miniupnpc/miniupnpc/minissdpc.c @@ -62,13 +62,13 @@ struct sockaddr_un { #include "miniupnpc_socketdef.h" -#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__GNU__) && !defined(__FreeBSD_kernel__) +#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__GNU__) && !defined(__FreeBSD_kernel__) && !defined(__HAIKU__) #define HAS_IP_MREQN #endif #if !defined(HAS_IP_MREQN) && !defined(_WIN32) #include <sys/ioctl.h> -#if defined(__sun) +#if defined(__sun) || defined(__HAIKU__) #include <sys/sockio.h> #endif #endif diff --git a/thirdparty/miniupnpc/miniupnpc/portlistingparse.c b/thirdparty/miniupnpc/miniupnpc/portlistingparse.c index 55859f2714..18d967b877 100644 --- a/thirdparty/miniupnpc/miniupnpc/portlistingparse.c +++ b/thirdparty/miniupnpc/miniupnpc/portlistingparse.c @@ -1,7 +1,7 @@ /* $Id: portlistingparse.c,v 1.9 2015/07/15 12:41:13 nanard Exp $ */ /* MiniUPnP project * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ - * (c) 2011-2016 Thomas Bernard + * (c) 2011-2020 Thomas Bernard * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution */ #include <string.h> @@ -12,6 +12,11 @@ #include "portlistingparse.h" #include "minixml.h" +#if defined(__HAIKU__) +/* rename our private function because Haiku already defines a atoui() function */ +#define atoui atoui2 +#endif + /* list of the elements */ static const struct { const portMappingElt code; diff --git a/thirdparty/miniupnpc/miniupnpc/upnpc.c b/thirdparty/miniupnpc/miniupnpc/upnpc.c index 4325658bee..cb7f18b5f6 100644 --- a/thirdparty/miniupnpc/miniupnpc/upnpc.c +++ b/thirdparty/miniupnpc/miniupnpc/upnpc.c @@ -1,7 +1,7 @@ /* $Id: upnpc.c,v 1.119 2018/03/13 23:34:46 nanard Exp $ */ /* Project : miniupnp * Author : Thomas Bernard - * Copyright (c) 2005-2019 Thomas Bernard + * Copyright (c) 2005-2020 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ @@ -580,7 +580,7 @@ int main(int argc, char ** argv) } #endif printf("upnpc : miniupnpc library test client, version %s.\n", MINIUPNPC_VERSION_STRING); - printf(" (c) 2005-2019 Thomas Bernard.\n"); + printf(" (c) 2005-2020 Thomas Bernard.\n"); printf("Go to http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/\n" "for more information.\n"); /* command line processing */ |