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

lib/upnp/Compat: workaround for -Wkeyword-macro

Browse Source
This commit is contained in:
Max Kellermann 2020-05-27 16:48:44 +02:00
parent 736a696f98
commit f03cc1012d
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/upnp/Callback.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_UPNP_CALLBACK_HXX
#define MPD_UPNP_CALLBACK_HXX
#include <upnp.h>
#include "Compat.hxx"
/**
* A class that is supposed to be used for libupnp asynchronous

2
src/lib/upnp/ClientInit.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_UPNP_CLIENT_INIT_HXX
#define MPD_UPNP_CLIENT_INIT_HXX
#include <upnp.h>
#include "Compat.hxx"
UpnpClient_Handle
UpnpClientGlobalInit();

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

@ -20,6 +20,16 @@
#ifndef MPD_UPNP_COMPAT_HXX
#define MPD_UPNP_COMPAT_HXX
#ifdef __clang__
/* libupnp versions until 1.10.1 redefine "bool" and "true" */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wkeyword-macro"
#endif
#include <upnp.h>
#ifdef __clang__
#pragma GCC diagnostic pop
#endif
#endif

3
src/lib/upnp/ContentDirectoryService.hxx
View File

@ -20,10 +20,9 @@
#ifndef _UPNPDIR_HXX_INCLUDED_
#define _UPNPDIR_HXX_INCLUDED_
#include "Compat.hxx"
#include "util/Compiler.h"
#include <upnp.h>
#include <string>
#include <forward_list>

2
src/lib/upnp/Discovery.hxx
View File

@ -29,8 +29,6 @@
#include "thread/Mutex.hxx"
#include "event/DeferEvent.hxx"
#include <upnp.h>
#include <boost/intrusive/list.hpp>
#include <list>

2
src/lib/upnp/Init.cxx
View File

@ -18,10 +18,10 @@
*/
#include "Init.hxx"
#include "Compat.hxx"
#include "thread/Mutex.hxx"
#include "util/RuntimeError.hxx"
#include <upnp.h>
#include <upnptools.h>
#include <ixml.h>