Merge tag 'v0.20.12'

release v0.20.12
2017-11-25 19:46:07 +01:00
parent f70b4e02c4 323231d1dd
commit 2b3c1d640e
7 changed files with 103 additions and 20 deletions
--- a/src/lib/upnp/ClientInit.cxx
+++ b/src/lib/upnp/ClientInit.cxx
@@ -33,7 +33,12 @@ static unsigned upnp_client_ref;
 static UpnpClient_Handle upnp_client_handle;

 static int
-UpnpClientCallback(Upnp_EventType et, void *evp, void *cookie) noexcept
+UpnpClientCallback(Upnp_EventType et,
+#if UPNP_VERSION >= 10800
+		   const
+#endif
+		   void *evp,
+		   void *cookie) noexcept
 {
 	if (cookie == nullptr)
 		/* this is the cookie passed to UpnpRegisterClient();