[Scummvm-git-logs] scummvm master -> 006b91f45bc23ce891a62383e1750d9dd8c737fa

[sluicebox]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
006b91f45b WIN32: Fix #includes in plugin provider


Commit: 006b91f45bc23ce891a62383e1750d9dd8c737fa
    https://github.com/scummvm/scummvm/commit/006b91f45bc23ce891a62383e1750d9dd8c737fa
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-07-07T01:20:25-05:00

Commit Message:
WIN32: Fix #includes in plugin provider

Changed paths:
    backends/plugins/win32/win32-provider.cpp


diff --git a/backends/plugins/win32/win32-provider.cpp b/backends/plugins/win32/win32-provider.cpp
index 87aecca8b9..9fdb52c901 100644
--- a/backends/plugins/win32/win32-provider.cpp
+++ b/backends/plugins/win32/win32-provider.cpp
@@ -19,21 +19,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
+ 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #include "common/scummsys.h"
 
 #if defined(DYNAMIC_MODULES) && defined(_WIN32)
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <tchar.h>
+
 #include "backends/platform/sdl/win32/win32_wrapper.h"
 #include "backends/plugins/win32/win32-provider.h"
 #include "backends/plugins/dynamic-plugin.h"
 #include "common/debug.h"
 #include "common/fs.h"
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-
 class Win32Plugin final : public DynamicPlugin {
 protected:
 	void *_dlHandle;