diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index adc202ce4db..c9d4a37798d 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -428,7 +428,7 @@ void osd_common_t::init(running_machine &machine) if (watchdog_timeout != 0) { - m_watchdog = std::make_unique(); + m_watchdog = std::make_unique(); m_watchdog->setTimeout(watchdog_timeout); } } diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h index 9afce249eb1..00778fac569 100644 --- a/src/osd/modules/lib/osdobj_common.h +++ b/src/osd/modules/lib/osdobj_common.h @@ -282,7 +282,7 @@ protected: input_module* m_lightgun_input; input_module* m_joystick_input; output_module* m_output; - std::unique_ptr m_watchdog; + std::unique_ptr m_watchdog; std::vector m_sliders; private: diff --git a/src/osd/watchdog.cpp b/src/osd/watchdog.cpp index 8a86464cb56..f963ef13f07 100644 --- a/src/osd/watchdog.cpp +++ b/src/osd/watchdog.cpp @@ -17,7 +17,7 @@ static void *watchdog_thread(void *param) { - watchdog *thiz = (watchdog *) param; + osd_watchdog *thiz = (osd_watchdog *) param; while (TRUE) { @@ -41,7 +41,7 @@ static void *watchdog_thread(void *param) return nullptr; } -watchdog::watchdog(void) +osd_watchdog::osd_watchdog(void) : m_event(1,0) { m_do_exit = 0; @@ -49,7 +49,7 @@ watchdog::watchdog(void) m_timeout = 60 * osd_ticks_per_second(); } -watchdog::~watchdog(void) +osd_watchdog::~osd_watchdog(void) { m_do_exit = 1; m_event.set(); @@ -57,7 +57,7 @@ watchdog::~watchdog(void) delete m_thread; } -void watchdog::setTimeout(int timeout) +void osd_watchdog::setTimeout(int timeout) { m_timeout = timeout * osd_ticks_per_second(); this->reset(); diff --git a/src/osd/watchdog.h b/src/osd/watchdog.h index f9c06e72bb0..dbcccf43abf 100644 --- a/src/osd/watchdog.h +++ b/src/osd/watchdog.h @@ -14,11 +14,11 @@ #include #include -class watchdog +class osd_watchdog { public: - watchdog(void); - ~watchdog(void); + osd_watchdog(void); + ~osd_watchdog(void); void reset() { m_event.set(); }