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

lib/upnp/Compat: remove obsolete kludges

Browse Source 
Those bugs have been fixed looong ago.
This commit is contained in:
Max Kellermann 2023-12-28 21:23:43 +01:00
parent b9a7a9981e
commit d0a4270449
6 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project // Copyright The Music Player Daemon Project
#ifndef MPD_UPNP_CALLBACK_HXX #pragma once
#define MPD_UPNP_CALLBACK_HXX
#include "Compat.hxx" #include <upnp.h>
/** /**
* A class that is supposed to be used for libupnp asynchronous * A class that is supposed to be used for libupnp asynchronous
@ -26,5 +25,3 @@ public:
virtual int Invoke(Upnp_EventType et, const void *evp) noexcept = 0; virtual int Invoke(Upnp_EventType et, const void *evp) noexcept = 0;
}; };
#endif

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

@ -1,15 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project // Copyright The Music Player Daemon Project
#ifndef MPD_UPNP_CLIENT_INIT_HXX #pragma once
#define MPD_UPNP_CLIENT_INIT_HXX
#include "Compat.hxx" #include <upnp.h>
UpnpClient_Handle UpnpClient_Handle
UpnpClientGlobalInit(const char* iface); UpnpClientGlobalInit(const char* iface);
void void
UpnpClientGlobalFinish() noexcept; UpnpClientGlobalFinish() noexcept;
#endif

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

@ -1,23 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project
#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"
/* 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>
#ifdef __clang__
#pragma GCC diagnostic pop
#endif
#endif

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

@ -1,10 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project // Copyright The Music Player Daemon Project
#ifndef _UPNPDIR_HXX_INCLUDED_ #pragma once
#define _UPNPDIR_HXX_INCLUDED_
#include "Compat.hxx" #include <upnp.h>
#include <string> #include <string>
#include <forward_list> #include <forward_list>
@ -103,5 +102,3 @@ public:
return m_friendlyName.c_str(); return m_friendlyName.c_str();
} }
}; };
#endif /* _UPNPDIR_HXX_INCLUDED_ */

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

@ -1,10 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
// Copyright The Music Player Daemon Project // Copyright The Music Player Daemon Project
#ifndef _UPNPPDISC_H_X_INCLUDED_
#define _UPNPPDISC_H_X_INCLUDED_
#include "Compat.hxx"
#include "Callback.hxx" #include "Callback.hxx"
#include "Device.hxx" #include "Device.hxx"
#include "lib/curl/Init.hxx" #include "lib/curl/Init.hxx"
@ -14,6 +10,8 @@
#include "event/InjectEvent.hxx" #include "event/InjectEvent.hxx"
#include "util/IntrusiveList.hxx" #include "util/IntrusiveList.hxx"
#include <upnp.h>
#include <list> #include <list>
#include <vector> #include <vector>
#include <string> #include <string>
@ -174,5 +172,3 @@ private:
int Invoke(Upnp_EventType et, const void *evp) noexcept override; int Invoke(Upnp_EventType et, const void *evp) noexcept override;
}; };
#endif /* _UPNPPDISC_H_X_INCLUDED_ */

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

@ -2,10 +2,10 @@
// Copyright The Music Player Daemon Project // Copyright The Music Player Daemon Project
#include "Init.hxx" #include "Init.hxx"
#include "Compat.hxx"
#include "Error.hxx" #include "Error.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include <upnp.h>
#include <upnptools.h> #include <upnptools.h>
#ifdef USING_PUPNP #ifdef USING_PUPNP
# include <ixml.h> # include <ixml.h>