From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: NOTICE (TYPE NAME CONSOLIDATION) Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8 --- src/osd/modules/input/input_dinput.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/osd/modules/input/input_dinput.cpp') diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index 694bf80b984..b47a7f86e7d 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -41,7 +41,7 @@ using namespace Microsoft::WRL; -static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_internal); +static int32_t dinput_joystick_pov_get_state(void *device_internal, void *item_internal); //============================================================ // dinput_set_dword_property @@ -239,7 +239,7 @@ public: { HRESULT result = m_dinput_helper->enum_attached_devices(dinput_devclass(), this, &machine); if (result != DI_OK) - fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast(result)); + fatalerror("DirectInput: Unable to enumerate keyboards (result=%08X)\n", static_cast(result)); } static std::string device_item_name(dinput_device * devinfo, int offset, const char * defstring, const TCHAR * suffix) @@ -457,7 +457,7 @@ void dinput_joystick_device::poll() int dinput_joystick_device::configure() { HRESULT result; - UINT32 axisnum, axiscount; + uint32_t axisnum, axiscount; auto devicelist = static_cast(module()).devicelist(); @@ -514,7 +514,7 @@ int dinput_joystick_device::configure() } // populate the POVs - for (UINT32 povnum = 0; povnum < dinput.caps.dwPOVs; povnum++) + for (uint32_t povnum = 0; povnum < dinput.caps.dwPOVs; povnum++) { std::string name; @@ -536,7 +536,7 @@ int dinput_joystick_device::configure() } // populate the buttons - for (UINT32 butnum = 0; butnum < dinput.caps.dwButtons; butnum++) + for (uint32_t butnum = 0; butnum < dinput.caps.dwButtons; butnum++) { uintptr_t offset = reinterpret_cast(&static_cast(nullptr)->rgbButtons[butnum]); std::string name = dinput_module::device_item_name(this, offset, default_button_name(butnum), nullptr); @@ -603,12 +603,12 @@ public: // dinput_joystick_pov_get_state //============================================================ -static INT32 dinput_joystick_pov_get_state(void *device_internal, void *item_internal) +static int32_t dinput_joystick_pov_get_state(void *device_internal, void *item_internal) { dinput_joystick_device *devinfo = static_cast(device_internal); int povnum = reinterpret_cast(item_internal) / 4; int povdir = reinterpret_cast(item_internal) % 4; - INT32 result = 0; + int32_t result = 0; DWORD pov; // get the current state -- cgit v1.2.3-70-g09d2