mirror of
https://github.com/libretro/RetroArch
synced 2025-03-31 01:21:03 +00:00
Merge pull request #4110 from GregorR/natt-miniupnpc-2.0
Support for both MiniUPNPC 2.0 and MiniUPNPC < 2.0
This commit is contained in:
commit
99c7d6aeea
@ -50,7 +50,11 @@ void natt_init(void)
|
|||||||
int upnperror = 0;
|
int upnperror = 0;
|
||||||
memset(&urls, 0, sizeof(struct UPNPUrls));
|
memset(&urls, 0, sizeof(struct UPNPUrls));
|
||||||
memset(&data, 0, sizeof(struct IGDdatas));
|
memset(&data, 0, sizeof(struct IGDdatas));
|
||||||
|
#if MINIUPNPC_API_VERSION < 16
|
||||||
devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
|
devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
|
||||||
|
#else
|
||||||
|
devlist = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &upnperror);
|
||||||
|
#endif
|
||||||
if (devlist)
|
if (devlist)
|
||||||
{
|
{
|
||||||
dev = devlist;
|
dev = devlist;
|
||||||
@ -63,7 +67,11 @@ void natt_init(void)
|
|||||||
if (!dev)
|
if (!dev)
|
||||||
dev = devlist;
|
dev = devlist;
|
||||||
|
|
||||||
|
#if MINIUPNPC_API_VERSION < 16
|
||||||
descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0);
|
descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0);
|
||||||
|
#else
|
||||||
|
descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0, NULL);
|
||||||
|
#endif
|
||||||
if (descXML)
|
if (descXML)
|
||||||
{
|
{
|
||||||
parserootdesc (descXML, descXMLsize, &data);
|
parserootdesc (descXML, descXMLsize, &data);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user