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

src/lib/upnp/Callback.hxx

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

src/lib/upnp/ClientInit.hxx

@@ -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();

src/lib/upnp/Compat.hxx

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

src/lib/upnp/ContentDirectoryService.hxx

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

src/lib/upnp/Discovery.hxx

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

src/lib/upnp/Init.cxx

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