Merge branch 'v0.23.x'

This commit is contained in:
Max Kellermann
2022-04-26 18:30:34 +02:00
16 changed files with 187 additions and 89 deletions
+1 -7
View File
@@ -35,13 +35,7 @@ static unsigned upnp_ref;
static void
DoInit(const char* iface)
{
#ifdef UPNP_ENABLE_IPV6
auto code = UpnpInit2(iface, 0);
#else
auto code = UpnpInit(iface, 0);
#endif
if (code != UPNP_E_SUCCESS)
if (auto code = UpnpInit2(iface, 0); code != UPNP_E_SUCCESS)
throw FormatRuntimeError("UpnpInit() failed: %s",
UpnpGetErrorMessage(code));