From 97b67170277437131adf6ed4d60139c172529e4f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 26 Mar 2019 11:13:37 +1100 Subject: (nw) Clean up the mess on master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release. --- src/osd/windows/video.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src/osd/windows/video.h') diff --git a/src/osd/windows/video.h b/src/osd/windows/video.h index 3f4b49efbe4..c012e42af9d 100644 --- a/src/osd/windows/video.h +++ b/src/osd/windows/video.h @@ -1,19 +1,29 @@ // license:BSD-3-Clause -// copyright-holders:Aaron Giles +// copyright-holders:Aaron Giles, Vas Crabb //============================================================ // -// video.h - Win32 implementation of MAME video routines +// video.h - Win32 video helpers // //============================================================ +#ifndef MAME_OSD_WINDOWS_VIDEO_H +#define MAME_OSD_WINDOWS_VIDEO_H -#ifndef __WIN_VIDEO__ -#define __WIN_VIDEO__ +#pragma once #include "modules/osdhelper.h" -inline osd_rect RECT_to_osd_rect(const RECT &r) +#include + + +constexpr osd_rect RECT_to_osd_rect(RECT const &r) { return osd_rect(r.left, r.top, r.right - r.left, r.bottom - r.top); } -#endif +inline RECT osd_rect_to_RECT(osd_rect const &r) +{ + RECT const result{ r.left(), r.top(), r.right(), r.bottom() }; + return result; +} + +#endif // MAME_OSD_WINDOWS_VIDEO_H -- cgit v1.2.3-70-g09d2