From fa2d8a88a49f642842b51923b8409b54a43c6e25 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Fri, 2 Jul 2010 03:55:48 +0000 Subject: [PATCH] Oops, forgot to remove some dead code. --- src/osd/windows/winmain.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index 01ca514d26b..885ed31ee87 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -374,26 +374,6 @@ const options_entry mame_win_options[] = -//************************************************************************** -// INLINE FUNCTIONS -//************************************************************************** - -#ifdef PTR64 -#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64 -inline FPTR ip_from_context(CONTEXT &context) -{ - return context.Rip; -} -#else -#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386 -inline FPTR ip_from_context(CONTEXT &context) -{ - return context.Eip; -} -#endif - - - //************************************************************************** // MAIN ENTRY POINT //************************************************************************** @@ -831,7 +811,13 @@ bool stack_walker::unwind() { // if we were able to initialize, then we have everything we need if (s_initialized) - return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_NATIVE, m_process, m_thread, &m_stackframe, &m_context, NULL, *m_sym_function_table_access_64, *m_sym_get_module_base_64, NULL); + { +#ifdef PTR64 + return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_AMD64, m_process, m_thread, &m_stackframe, &m_context, NULL, *m_sym_function_table_access_64, *m_sym_get_module_base_64, NULL); +#else + return (*m_stack_walk_64)(IMAGE_FILE_MACHINE_I386, m_process, m_thread, &m_stackframe, &m_context, NULL, *m_sym_function_table_access_64, *m_sym_get_module_base_64, NULL); +#endif + } // otherwise, fake the first unwind, which will just return info from the context else