diff options
author | Brad Hughes <bradhugh@outlook.com> | 2016-12-14 12:37:37 -0500 |
---|---|---|
committer | Brad Hughes <bradhugh@outlook.com> | 2016-12-28 15:07:28 -0500 |
commit | b47ec24df6e2fd64ff4757dc5661fb9249dce617 (patch) | |
tree | c7b5d82b88c2954de4961d5f951335dede6cf96c /src/osd/modules/input | |
parent | e252486d1726386c1bd2590edc0f8819fa7b1e8d (diff) |
Move special windows.h include directives to build defines (nw)
Diffstat (limited to 'src/osd/modules/input')
-rw-r--r-- | src/osd/modules/input/input_common.h | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/input/input_rawinput.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/input/input_uwp.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_win32.cpp | 3 | ||||
-rw-r--r-- | src/osd/modules/input/input_windows.h | 1 | ||||
-rw-r--r-- | src/osd/modules/input/input_winhybrid.cpp | 5 | ||||
-rw-r--r-- | src/osd/modules/input/input_xinput.cpp | 3 |
8 files changed, 1 insertions, 21 deletions
diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index c98845eb885..96a197f2543 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -21,8 +21,6 @@ #include <queue> #include <algorithm> #include <functional> -#undef min -#undef max //============================================================ diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index b47a7f86e7d..4d434ce3b4c 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -12,7 +12,6 @@ #if defined(OSD_WINDOWS) // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <initguid.h> #include <tchar.h> @@ -22,8 +21,6 @@ #undef WINNT #include <dinput.h> #undef interface -#undef min -#undef max #include <mutex> diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index 3f5274c6eba..9243ec4a0f4 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -12,12 +12,9 @@ #if defined(OSD_WINDOWS) // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <tchar.h> #undef interface -#undef min -#undef max #include <mutex> #include <functional> diff --git a/src/osd/modules/input/input_uwp.cpp b/src/osd/modules/input/input_uwp.cpp index 86e9ecfe671..ece01a41662 100644 --- a/src/osd/modules/input/input_uwp.cpp +++ b/src/osd/modules/input/input_uwp.cpp @@ -14,8 +14,6 @@ #include <agile.h> #include <ppltasks.h> #include <collection.h> -#undef min -#undef max #undef interface // MAME headers diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index a4e00eec17f..c07a1c681d8 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -12,12 +12,9 @@ #if defined(OSD_WINDOWS) // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <tchar.h> #undef interface -#undef min -#undef max // MAME headers #include "emu.h" diff --git a/src/osd/modules/input/input_windows.h b/src/osd/modules/input/input_windows.h index fb269df07cf..7afc487fb62 100644 --- a/src/osd/modules/input/input_windows.h +++ b/src/osd/modules/input/input_windows.h @@ -10,7 +10,6 @@ #define INPUT_WIN_H_ // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> #undef interface diff --git a/src/osd/modules/input/input_winhybrid.cpp b/src/osd/modules/input/input_winhybrid.cpp index dae3c4bc3bf..6b945710e3b 100644 --- a/src/osd/modules/input/input_winhybrid.cpp +++ b/src/osd/modules/input/input_winhybrid.cpp @@ -11,22 +11,19 @@ #if defined(OSD_WINDOWS) -#include <wbemcli.h> #include <list> #include <vector> // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <wrl/client.h> +#include <wbemcli.h> // XInput/DirectInput #include <xinput.h> #include <dinput.h> #undef interface -#undef min -#undef max // MAME headers #include "emu.h" diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index 8baf1fd6cdd..e6ecdd4d177 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -12,15 +12,12 @@ #if defined(OSD_WINDOWS) // standard windows headers -#define WIN32_LEAN_AND_MEAN #include <windows.h> // XInput header #include <xinput.h> #undef interface -#undef min -#undef max // MAME headers #include "emu.h" |