godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

miniupnpc: Sync with upstream master (4436632) 

(cherry picked from commit 0c37c4021b)
This commit is contained in:
CodeforEvolution 2020-03-06 16:29:50 -06:00 committed by Rémi Verschelde
parent 10f2ab59c1
commit 543ecb0217
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -281,7 +281,7 @@ File extracted from upstream release tarball (`-apache.tgz` variant):
## miniupnpc ## miniupnpc
- Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc
- Version: git (0ab1d67, 2019) - Version: git (4436632, 2020)
- License: BSD-3-Clause - License: BSD-3-Clause
Files extracted from upstream source: Files extracted from upstream source:

4
thirdparty/miniupnpc/miniupnpc/minissdpc.c vendored
View File

@ -62,13 +62,13 @@ struct sockaddr_un {
#include "miniupnpc_socketdef.h" #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 #define HAS_IP_MREQN
#endif #endif
#if !defined(HAS_IP_MREQN) && !defined(_WIN32) #if !defined(HAS_IP_MREQN) && !defined(_WIN32)
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if defined(__sun) #if defined(__sun) || defined(__HAIKU__)
#include <sys/sockio.h> #include <sys/sockio.h>
#endif #endif
#endif #endif

7
thirdparty/miniupnpc/miniupnpc/portlistingparse.c vendored
View File

@ -1,7 +1,7 @@
/* $Id: portlistingparse.c,v 1.9 2015/07/15 12:41:13 nanard Exp $ */ /* $Id: portlistingparse.c,v 1.9 2015/07/15 12:41:13 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * 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 * This software is subject to the conditions detailed
* in the LICENCE file provided within the distribution */ * in the LICENCE file provided within the distribution */
#include <string.h> #include <string.h>
@ -12,6 +12,11 @@
#include "portlistingparse.h" #include "portlistingparse.h"
#include "minixml.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 */ /* list of the elements */
static const struct { static const struct {
const portMappingElt code; const portMappingElt code;

4
thirdparty/miniupnpc/miniupnpc/upnpc.c vendored
View File

@ -1,7 +1,7 @@
/* $Id: upnpc.c,v 1.119 2018/03/13 23:34:46 nanard Exp $ */ /* $Id: upnpc.c,v 1.119 2018/03/13 23:34:46 nanard Exp $ */
/* Project : miniupnp /* Project : miniupnp
* Author : Thomas Bernard * 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 * This software is subject to the conditions detailed in the
* LICENCE file provided in this distribution. */ * LICENCE file provided in this distribution. */
@ -580,7 +580,7 @@ int main(int argc, char ** argv)
} }
#endif #endif
printf("upnpc : miniupnpc library test client, version %s.\n", MINIUPNPC_VERSION_STRING); 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" printf("Go to http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/\n"
"for more information.\n"); "for more information.\n");
/* command line processing */ /* command line processing */