upnp: use UpnpInit2 always

libupnp 1.14 removes the non 2 function. Fixes compilation there. Signed-off-by: Rosen Penev <rosenp@gmail.com> Closes https://github.com/MusicPlayerDaemon/MPD/issues/1499

upnp: use UpnpInit2 always
50d35c96 · Rosen Penev · Max Kellermann · 4260e788 · 50d35c96 · 50d35c96
Commit 50d35c96 authored Apr 23, 2022 by Rosen Penev Committed by Max Kellermann Apr 26, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

NEWS NEWS +2 -0

Init.cxx src/lib/upnp/Init.cxx +0 -4

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.23.7 (not yet released)
+* database
+  - upnp: support pupnp 1.14
 * decoder
  - opus: fix missing song length on high-latency files
 * output

--- a/src/lib/upnp/Init.cxx
+++ b/src/lib/upnp/Init.cxx
@@ -36,11 +36,7 @@ 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)
 		throw FormatRuntimeError("UpnpInit() failed: %s",
 					 UpnpGetErrorMessage(code));