diff options
author | 2016-07-31 11:50:20 +0200 | |
---|---|---|
committer | 2016-07-31 14:41:02 +0200 | |
commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/osd/modules/input/input_dinput.cpp | |
parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/osd/modules/input/input_dinput.cpp')
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 0db6695565d..0ef0fc2d095 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -22,7 +22,10 @@ #undef WINNT #include <dinput.h> #undef interface +#undef min +#undef max +#include <algorithm> #include <mutex> #include <thread> @@ -387,8 +390,8 @@ public: } // cap the number of axes and buttons based on the format - devinfo->dinput.caps.dwAxes = MIN(devinfo->dinput.caps.dwAxes, 3); - devinfo->dinput.caps.dwButtons = MIN(devinfo->dinput.caps.dwButtons, (devinfo->dinput.format == &c_dfDIMouse) ? 4 : 8); + devinfo->dinput.caps.dwAxes = std::min(devinfo->dinput.caps.dwAxes, DWORD(3)); + devinfo->dinput.caps.dwButtons = std::min(devinfo->dinput.caps.dwButtons, DWORD((devinfo->dinput.format == &c_dfDIMouse) ? 4 : 8)); // populate the axes for (axisnum = 0; axisnum < devinfo->dinput.caps.dwAxes; axisnum++) @@ -479,9 +482,9 @@ int dinput_joystick_device::configure() osd_printf_warning("DirectInput: Unable to reset saturation for joystick %d (%s)\n", devindex, name()); // cap the number of axes, POVs, and buttons based on the format - dinput.caps.dwAxes = MIN(dinput.caps.dwAxes, 8); - dinput.caps.dwPOVs = MIN(dinput.caps.dwPOVs, 4); - dinput.caps.dwButtons = MIN(dinput.caps.dwButtons, 128); + dinput.caps.dwAxes = std::min(dinput.caps.dwAxes, DWORD(8)); + dinput.caps.dwPOVs = std::min(dinput.caps.dwPOVs, DWORD(4)); + dinput.caps.dwButtons = std::min(dinput.caps.dwButtons, DWORD(128)); // populate the axes for (axisnum = axiscount = 0; axiscount < dinput.caps.dwAxes && axisnum < 8; axisnum++) |