diff options
| author | Max Kellermann <max@musicpd.org> | 2017-12-02 14:47:27 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-12-02 14:47:27 +0100 |
| commit | 78728138a04c2493c6bfadee98060043eca204bf (patch) | |
| tree | c457912a02c7a46cb3adf00f0ce123dda4ddf73c /src/lib | |
| parent | 63fc98591d9be2ee4f1ef11965f7eb0717689d68 (diff) | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/upnp/Compat.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
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 <upnp/upnp.h> #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 |