summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/input/input_xinput.cpp9
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp
index 5cdc3fd29a2..851a0799817 100644
--- a/src/osd/modules/input/input_xinput.cpp
+++ b/src/osd/modules/input/input_xinput.cpp
@@ -178,13 +178,13 @@ LSX 15 C
#if defined(OSD_WINDOWS) || defined(SDLMAME_WIN32)
+// emu
+#include "emu.h" // put this here before windows.h defines interface as a macro
+
#include "input_xinput.h"
#include "modules/lib/osdobj_common.h"
-// emu
-#include "emu.h"
-
// lib/util
#include "util/coretmpl.h"
@@ -196,9 +196,6 @@ LSX 15 C
#include <tuple>
#include <utility>
-// standard windows headers
-#include <windows.h>
-
#define XINPUT_LIBRARIES { "xinput1_4.dll", "xinput9_1_0.dll" }
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index a1e5f7d2e01..59a3762b4c2 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -571,7 +571,7 @@ void shaders::begin_frame(render_primitive_list *primlist)
std::fill(std::begin(target_to_screen), std::end(target_to_screen), 0);
std::fill(std::begin(targets_per_screen), std::end(targets_per_screen), 0);
- render_container *containers[sizeof(target_to_screen)/sizeof(*target_to_screen)];
+ EQUIVALENT_ARRAY(target_to_screen, render_container *) containers;
// Maximum potential runtime O(max_num_targets^2)
num_targets = 0;