Build fails with system miniupnpc >= 1.9.20150730

[megaglest]

Build fails with system miniupnpc >= 1.9.20150730

[titiger]

How can we fix this so we can support old and new version ?

[softcoder]

I pushed a fix for this in the sdl2 branch

[filux]

Not tested in practice with v.3.11.1, but imo this patch should work (if someone need it "now") :

diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
index a5d4b92..692dd40 100644
--- a/source/shared_lib/sources/platform/posix/socket.cpp
+++ b/source/shared_lib/sources/platform/posix/socket.cpp
@@ -2566,8 +2566,12 @@ int UPNP_Tools::upnp_init(void *param) {
        int upnp_error = 0;

 #ifndef MINIUPNPC_VERSION_PRE1_6
+   #if !defined(MINIUPNPC_API_VERSION) || MINIUPNPC_API_VERSION < 14
        devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
-
+   #else
+       // miniupnpc 1.9.20150730
+       devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, 2, &upnp_error);
+   #endif
        if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
        if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);