diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/osd/windows/winmain.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
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.
Diffstat (limited to 'src/osd/windows/winmain.cpp')
-rw-r--r-- | src/osd/windows/winmain.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/osd/windows/winmain.cpp b/src/osd/windows/winmain.cpp index 9225acc0443..45d790aea78 100644 --- a/src/osd/windows/winmain.cpp +++ b/src/osd/windows/winmain.cpp @@ -6,20 +6,6 @@ // //============================================================ -// only for oslog callback -#include <functional> - -// standard windows headers -#include <windows.h> -#include <commctrl.h> -#include <mmsystem.h> -#include <tchar.h> -#include <io.h> - -// standard C headers -#include <ctype.h> -#include <stdarg.h> - // MAME headers #include "emu.h" #include "emuopts.h" @@ -34,6 +20,18 @@ #include "modules/diagnostics/diagnostics_module.h" #include "modules/monitor/monitor_common.h" +// standard C headers +#include <ctype.h> +#include <stdarg.h> +#include <stdio.h> + +// standard windows headers +#include <windows.h> +#include <commctrl.h> +#include <mmsystem.h> +#include <tchar.h> +#include <io.h> + #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) #include <wrl/client.h> using namespace Windows::Storage; @@ -475,6 +473,8 @@ void windows_osd_interface::output_oslog(const char *buffer) { if (IsDebuggerPresent()) win_output_debug_string_utf8(buffer); + else + fputs(buffer, stderr); } @@ -573,10 +573,7 @@ void windows_osd_interface::init(running_machine &machine) // hook up the debugger log if (options.oslog()) - { - using namespace std::placeholders; - machine.add_logerror_callback(std::bind(&windows_osd_interface::output_oslog, this, _1)); - } + machine.add_logerror_callback(&windows_osd_interface::output_oslog); #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) // crank up the multimedia timer resolution to its max |