Merge branch 'v0.23.x'

This commit is contained in:
Max Kellermann 2022-05-20 10:04:19 +02:00
commit b22c00d0cd
1 changed files with 4 additions and 0 deletions

View File

@ -24,6 +24,10 @@
/* libupnp versions until 1.10.1 redefine "bool" and "true" */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wkeyword-macro"
/* libupnp 1.8.4 uses a flawed kludge to suppress this warning in
inline function __list_add_valid() */
#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
#endif
#include <upnp.h>