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 714011c8) on this libupnp version. Closes #163

lib/upnp/Compat: disable the 1.8 API emulation with libupnp 1.6.24
78728138 · Max Kellermann · 63fc9859 · 78728138 · 78728138
Commit 78728138 authored Dec 02, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

NEWS NEWS +1 -0

Compat.hxx src/lib/upnp/Compat.hxx +5 -2

No files found.
--- a/NEWS
+++ b/NEWS
 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

--- 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