oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/upnp/Compat: disable the 1.8 API emulation with libupnp 1.6.24

Browse Source 
libupnp 1.6.24 added a few badly designed macros which break the MPD
build:

 8177a4195a/

To work around this, we disable our emulation functions (from
714011c81e) on this libupnp version.

Closes #163
This commit is contained in:
Max Kellermann
2017-12-02 14:47:27 +01:00
parent 63fc98591d
commit 78728138a0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,6 +1,7 @@
ver 0.20.13 (not yet released) ver 0.20.13 (not yet released)
* database * database
- simple: don't purge mount points on update/rescan - 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) ver 0.20.12 (2017/11/25)
* database * database

7
src/lib/upnp/Compat.hxx
View File

@@ -23,12 +23,15 @@
#include <upnp/upnp.h> #include <upnp/upnp.h>
#if UPNP_VERSION < 10800 #if UPNP_VERSION < 10800
#include "Compiler.h"
/* emulate the libupnp 1.8 API with older versions */ /* emulate the libupnp 1.8 API with older versions */
using UpnpDiscovery = Upnp_Discovery; using UpnpDiscovery = Upnp_Discovery;
#endif
#if UPNP_VERSION < 10624
#include "Compiler.h"
gcc_pure gcc_pure
static inline int static inline int
UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept UpnpDiscovery_get_Expires(const UpnpDiscovery *disco) noexcept