Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-12-03 16:22:08 +01:00
12 changed files with 47 additions and 15 deletions

View File

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