From 78728138a04c2493c6bfadee98060043eca204bf Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 2 Dec 2017 14:47:27 +0100 Subject: [PATCH] lib/upnp/Compat: disable the 1.8 API emulation with libupnp 1.6.24 libupnp 1.6.24 added a few badly designed macros which break the MPD build: https://sourceforge.net/p/pupnp/code/ci/8177a4195a4d4a5d6cb095eaf4ca5b65ac446381/ To work around this, we disable our emulation functions (from 714011c81ed6053f7a35812071499356f337dd70) on this libupnp version. Closes #163 --- NEWS | 1 + src/lib/upnp/Compat.hxx | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d82e2b19d..998836c38 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.20.13 (not yet released) * database - simple: don't purge mount points on update/rescan + - upnp: work around libupnp 1.6.24 API breakage ver 0.20.12 (2017/11/25) * database diff --git a/src/lib/upnp/Compat.hxx b/src/lib/upnp/Compat.hxx index 2e2d2f1de..c9f1cc47f 100644 --- a/src/lib/upnp/Compat.hxx +++ b/src/lib/upnp/Compat.hxx @@ -23,12 +23,15 @@ #include #if UPNP_VERSION < 10800 -#include "Compiler.h" - /* emulate the libupnp 1.8 API with older versions */ using UpnpDiscovery = Upnp_Discovery; +#endif + +#if UPNP_VERSION < 10624 +#include "Compiler.h" + gcc_pure static inline int UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept