meson.build: define NOUSER on Windows for lighter windows.h
A few exceptions are needed for sources which include COM header (directly or indirectly). This fixes lots of shadow warnings, see https://github.com/MusicPlayerDaemon/MPD/issues/1150
This commit is contained in:
@@ -17,6 +17,11 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
// COM needs the "MSG" typedef, and shlwapi.h includes COM headers
|
||||
#undef NOUSER
|
||||
#endif
|
||||
|
||||
#include "Glob.hxx"
|
||||
|
||||
#ifdef _WIN32
|
||||
|
@@ -17,6 +17,10 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
#undef NOUSER // COM needs the "MSG" typedef, and shlobj.h includes COM headers
|
||||
#endif
|
||||
|
||||
#include "StandardDirectory.hxx"
|
||||
#include "FileSystem.hxx"
|
||||
#include "XDG.hxx"
|
||||
|
@@ -17,6 +17,8 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#undef NOUSER // COM needs the "MSG" typedef
|
||||
|
||||
#include "output/plugins/wasapi/ForMixer.hxx"
|
||||
#include "output/plugins/wasapi/AudioClient.hxx"
|
||||
#include "output/plugins/wasapi/Device.hxx"
|
||||
|
@@ -17,6 +17,8 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#undef NOUSER // COM needs the "MSG" typedef
|
||||
|
||||
#include "WasapiOutputPlugin.hxx"
|
||||
#include "ForMixer.hxx"
|
||||
#include "AudioClient.hxx"
|
||||
|
@@ -23,6 +23,7 @@
|
||||
#include "HResult.hxx"
|
||||
|
||||
#include <combaseapi.h>
|
||||
#include <objbase.h> // for COINIT_APARTMENTTHREADED
|
||||
|
||||
// RAII for Microsoft Component Object Model(COM)
|
||||
// https://docs.microsoft.com/en-us/windows/win32/api/_com/
|
||||
|
@@ -17,6 +17,8 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#undef NOUSER // COM needs the "MSG" typedef
|
||||
|
||||
#include "ComWorker.hxx"
|
||||
#include "Com.hxx"
|
||||
#include "thread/Name.hxx"
|
||||
|
@@ -17,6 +17,11 @@
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
// COM needs the "MSG" typedef, and audiopolicy.h includes COM headers
|
||||
#undef NOUSER
|
||||
#endif
|
||||
|
||||
#include "HResult.hxx"
|
||||
#include "system/Error.hxx"
|
||||
|
||||
@@ -25,6 +30,7 @@
|
||||
#include <cstdio>
|
||||
#include <memory>
|
||||
|
||||
#include <combaseapi.h> // needed by audiopolicy.h if COM_NO_WINDOWS_H is defined
|
||||
#include <audiopolicy.h>
|
||||
|
||||
std::string_view
|
||||
|
@@ -20,6 +20,7 @@
|
||||
#ifndef MPD_WIN32_PROPVARIANT_HXX
|
||||
#define MPD_WIN32_PROPVARIANT_HXX
|
||||
|
||||
#include <combaseapi.h> // needed by propidl.h if COM_NO_WINDOWS_H is defined
|
||||
#include <propidl.h>
|
||||
|
||||
class AllocatedString;
|
||||
|
Reference in New Issue
Block a user