diff options
author | Vas Crabb <vas@vastheman.com> | 2019-11-18 05:08:36 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-11-18 05:08:36 +1100 |
commit | 88ce545cdda64659894b87fc0b98e1b044eea3e0 (patch) | |
tree | 9a1f05f459b773c70a2ef64443cbe8fee2a3ccd1 /src/osd/modules/debugger | |
parent | 1fbfa9e071fe1824ea47c567c23778d8ab33cacf (diff) |
misc cleanup:
* Got rid of some more simple_list in core debugger code
* Fixed a buffer overrun in wavwrite (buffer half requried size)
* Slightly reduced dependencies and overhead in wavwrite
* Made new disassembly windows in Qt debugger default to current CPU
Diffstat (limited to 'src/osd/modules/debugger')
23 files changed, 106 insertions, 87 deletions
diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp index 39dcb3310cf..487ad42ecc5 100644 --- a/src/osd/modules/debugger/debugimgui.cpp +++ b/src/osd/modules/debugger/debugimgui.cpp @@ -262,7 +262,7 @@ static inline void map_attr_to_fg_bg(unsigned char attr, rgb_t *fg, rgb_t *bg) bool debug_imgui::get_view_source(void* data, int idx, const char** out_text) { debug_view* vw = static_cast<debug_view*>(data); - *out_text = vw->source_list().find(idx)->name(); + *out_text = vw->source(idx)->name(); return true; } @@ -754,13 +754,9 @@ void debug_imgui::add_log(int id) void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened) { - const debug_view_source* src; - ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiCond_Once); if(ImGui::Begin(view_ptr->title.c_str(),opened,ImGuiWindowFlags_MenuBar)) { - int idx; - bool done = false; bool exp_change = false; view_ptr->is_collapsed = false; @@ -788,7 +784,7 @@ void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened) ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll; if(m_running) flags |= ImGuiInputTextFlags_ReadOnly; - ImGui::Combo("##cpu",&view_ptr->src_sel,get_view_source,view_ptr->view,view_ptr->view->source_list().count()); + ImGui::Combo("##cpu",&view_ptr->src_sel,get_view_source,view_ptr->view,view_ptr->view->source_count()); ImGui::SameLine(); ImGui::PushItemWidth(-1.0f); if(ImGui::InputText("##addr",view_ptr->console_input,512,flags)) @@ -800,17 +796,15 @@ void debug_imgui::draw_disasm(debug_area* view_ptr, bool* opened) ImGui::Separator(); // disassembly portion - src = view_ptr->view->first_source(); - idx = 0; - while (!done) + unsigned idx = 0; + const debug_view_source* src = view_ptr->view->source(idx); + do { if(view_ptr->src_sel == idx) view_ptr->view->set_source(*src); - idx++; - src = src->next(); - if(src == nullptr) - done = true; + src = view_ptr->view->source(++idx); } + while (src); ImGui::BeginChild("##disasm_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn draw_view(view_ptr,exp_change); @@ -841,13 +835,9 @@ void debug_imgui::add_disasm(int id) void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened) { - const debug_view_source* src; - ImGui::SetNextWindowSize(ImVec2(view_ptr->width,view_ptr->height + ImGui::GetTextLineHeight()),ImGuiCond_Once); if(ImGui::Begin(view_ptr->title.c_str(),opened,ImGuiWindowFlags_MenuBar)) { - int idx; - bool done = false; bool exp_change = false; view_ptr->is_collapsed = false; @@ -906,22 +896,20 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened) ImGui::PopItemWidth(); ImGui::SameLine(); ImGui::PushItemWidth(-1.0f); - ImGui::Combo("##region",&view_ptr->src_sel,get_view_source,view_ptr->view,view_ptr->view->source_list().count()); + ImGui::Combo("##region",&view_ptr->src_sel,get_view_source,view_ptr->view,view_ptr->view->source_count()); ImGui::PopItemWidth(); ImGui::Separator(); // memory editor portion - src = view_ptr->view->first_source(); - idx = 0; - while (!done) + unsigned idx = 0; + const debug_view_source* src = view_ptr->view->source(idx); + do { if(view_ptr->src_sel == idx) view_ptr->view->set_source(*src); - idx++; - src = src->next(); - if(src == nullptr) - done = true; + src = view_ptr->view->source(++idx); } + while (src); ImGui::BeginChild("##memory_output", ImVec2(ImGui::GetWindowWidth() - 16,ImGui::GetWindowHeight() - ImGui::GetTextLineHeight() - ImGui::GetCursorPosY())); // account for title bar and widgets already drawn draw_view(view_ptr,exp_change); diff --git a/src/osd/modules/debugger/osx/disassemblyview.mm b/src/osd/modules/debugger/osx/disassemblyview.mm index 99bdc485147..f958d793b47 100644 --- a/src/osd/modules/debugger/osx/disassemblyview.mm +++ b/src/osd/modules/debugger/osx/disassemblyview.mm @@ -118,16 +118,16 @@ - (int)selectedSubviewIndex { const debug_view_source *source = view->source(); if (source != nullptr) - return view->source_list().indexof(*source); + return view->source_index(*source); else return -1; } - (void)selectSubviewAtIndex:(int)index { - const int selected = view->source_list().indexof(*view->source()); + const int selected = view->source_index(*view->source()); if (selected != index) { - view->set_source(*view->source_list().find(index)); + view->set_source(*view->source(index)); if ([[self window] firstResponder] != self) view->set_cursor_visible(false); } @@ -256,12 +256,12 @@ - (void)insertSubviewItemsInMenu:(NSMenu *)menu atIndex:(NSInteger)index { - for (const debug_view_source *source = view->source_list().first(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { [[menu insertItemWithTitle:[NSString stringWithUTF8String:source->name()] action:NULL keyEquivalent:@"" - atIndex:index++] setTag:view->source_list().indexof(*source)]; + atIndex:index++] setTag:view->source_index(*source)]; } if (index < [menu numberOfItems]) [menu insertItem:[NSMenuItem separatorItem] atIndex:index++]; diff --git a/src/osd/modules/debugger/osx/memoryview.mm b/src/osd/modules/debugger/osx/memoryview.mm index b2c512d094b..594e32e0fd7 100644 --- a/src/osd/modules/debugger/osx/memoryview.mm +++ b/src/osd/modules/debugger/osx/memoryview.mm @@ -101,17 +101,17 @@ - (int)selectedSubviewIndex { debug_view_source const *source = view->source(); if (source != nullptr) - return view->source_list().indexof(*source); + return view->source_index(*source); else return -1; } - (void)selectSubviewAtIndex:(int)index { - int const selected = view->source_list().indexof(*view->source()); + int const selected = view->source_index(*view->source()); if (selected != index) { - view->set_source(*view->source_list().find(index)); + view->set_source(*view->source(index)); if ([[self window] firstResponder] != self) view->set_cursor_visible(false); } @@ -299,12 +299,12 @@ - (void)insertSubviewItemsInMenu:(NSMenu *)menu atIndex:(NSInteger)index { - for (const debug_view_source *source = view->source_list().first(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { [[menu insertItemWithTitle:[NSString stringWithUTF8String:source->name()] action:NULL keyEquivalent:@"" - atIndex:index++] setTag:view->source_list().indexof(*source)]; + atIndex:index++] setTag:view->source_index(*source)]; } if (index < [menu numberOfItems]) [menu insertItem:[NSMenuItem separatorItem] atIndex:index++]; diff --git a/src/osd/modules/debugger/osx/registersview.mm b/src/osd/modules/debugger/osx/registersview.mm index 5c3e00a2b89..ae202fa488e 100644 --- a/src/osd/modules/debugger/osx/registersview.mm +++ b/src/osd/modules/debugger/osx/registersview.mm @@ -34,7 +34,7 @@ const debug_view_source *source = view->source_for_device(curcpu); max.x = max.y = 0; - for (const debug_view_source *source = view->source_list().first(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { debug_view_xy current; view->set_source(*source); diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index 5c575b400b1..04cbd523cdd 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -52,9 +52,7 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) : // Populate the combo box & set the proper cpu populateComboBox(); - //const debug_view_source *source = mem->views[0]->view->source_for_device(curcpu); - //gtk_combo_box_set_active(zone_w, mem->views[0]->view->source_list().indexof(*source)); - //mem->views[0]->view->set_source(*source); + setToCurrentCpu(); // Layout @@ -121,7 +119,7 @@ DasmWindow::~DasmWindow() void DasmWindow::cpuChanged(int index) { - m_dasmView->view()->set_source(*m_dasmView->view()->source_list().find(index)); + m_dasmView->view()->set_source(*m_dasmView->view()->source(index)); m_dasmView->viewport()->update(); } @@ -253,9 +251,24 @@ void DasmWindow::populateComboBox() return; m_cpuComboBox->clear(); - for (const debug_view_source &source : m_dasmView->view()->source_list()) + for (auto &source : m_dasmView->view()->source_list()) { - m_cpuComboBox->addItem(source.name()); + m_cpuComboBox->addItem(source->name()); + } +} + + +void DasmWindow::setToCurrentCpu() +{ + device_t* curCpu = m_machine->debugger().cpu().get_visible_cpu(); + if (curCpu) + { + const debug_view_source *source = m_dasmView->view()->source_for_device(curCpu); + if (source) + { + const int listIndex = m_dasmView->view()->source_index(*source); + m_cpuComboBox->setCurrentIndex(listIndex); + } } } diff --git a/src/osd/modules/debugger/qt/dasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h index 27b652c04e8..9b73fed4534 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.h +++ b/src/osd/modules/debugger/qt/dasmwindow.h @@ -36,6 +36,7 @@ private slots: private: void populateComboBox(); + void setToCurrentCpu(); // Widgets diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index c799ab66c65..6c95e04df80 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -166,7 +166,7 @@ MemoryWindow::~MemoryWindow() void MemoryWindow::memoryRegionChanged(int index) { - m_memTable->view()->set_source(*m_memTable->view()->source_list().find(index)); + m_memTable->view()->set_source(*m_memTable->view()->source(index)); m_memTable->viewport()->update(); // Update the data format radio buttons to the memory region's default @@ -283,9 +283,9 @@ void MemoryWindow::populateComboBox() return; m_memoryComboBox->clear(); - for (const debug_view_source &source : m_memTable->view()->source_list()) + for (auto &source : m_memTable->view()->source_list()) { - m_memoryComboBox->addItem(source.name()); + m_memoryComboBox->addItem(source->name()); } } @@ -293,9 +293,15 @@ void MemoryWindow::populateComboBox() void MemoryWindow::setToCurrentCpu() { device_t* curCpu = m_machine->debugger().cpu().get_visible_cpu(); - const debug_view_source *source = m_memTable->view()->source_for_device(curCpu); - const int listIndex = m_memTable->view()->source_list().indexof(*source); - m_memoryComboBox->setCurrentIndex(listIndex); + if (curCpu) + { + const debug_view_source *source = m_memTable->view()->source_for_device(curCpu); + if (source) + { + const int listIndex = m_memTable->view()->source_index(*source); + m_memoryComboBox->setCurrentIndex(listIndex); + } + } } diff --git a/src/osd/modules/debugger/win/consolewininfo.h b/src/osd/modules/debugger/win/consolewininfo.h index 7f8ccc13aec..e391100ed33 100644 --- a/src/osd/modules/debugger/win/consolewininfo.h +++ b/src/osd/modules/debugger/win/consolewininfo.h @@ -5,9 +5,10 @@ // consolewininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_CONSOLEWININFO_H +#define MAME_DEBUGGER_WIN_CONSOLEWININFO_H -#ifndef __DEBUG_WIN_CONSOLE_WIN_INFO_H__ -#define __DEBUG_WIN_CONSOLE_WIN_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/debugbaseinfo.h b/src/osd/modules/debugger/win/debugbaseinfo.h index 03fd5a8018d..15f4b845e7c 100644 --- a/src/osd/modules/debugger/win/debugbaseinfo.h +++ b/src/osd/modules/debugger/win/debugbaseinfo.h @@ -5,14 +5,14 @@ // debugbaseinfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DEBUGBASEINFO_H +#define MAME_DEBUGGER_WIN_DEBUGBASEINFO_H -#ifndef __DEBUG_WIN_DEBUG_BASE_INFO_H__ -#define __DEBUG_WIN_DEBUG_BASE_INFO_H__ +#pragma once #include "debugwin.h" - class debugbase_info { protected: @@ -35,5 +35,4 @@ private: bool const &m_waiting_for_debugger; }; - #endif diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp index 97238ff8862..686bd89bb2d 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.cpp +++ b/src/osd/modules/debugger/win/debugviewinfo.cpp @@ -111,9 +111,9 @@ uint32_t debugview_info::maxwidth() { uint32_t max = m_view->total_size().x; debug_view_source const *const cursource = m_view->source(); - for (const debug_view_source &source : m_view->source_list()) + for (auto &source : m_view->source_list()) { - m_view->set_source(source); + m_view->set_source(*source); uint32_t const chars = m_view->total_size().x; if (max < chars) max = chars; @@ -217,7 +217,7 @@ bool debugview_info::set_source_index(int index) { if (m_view != nullptr) { - const debug_view_source *const source = m_view->source_list().find(index); + const debug_view_source *const source = m_view->source(index); if (source != nullptr) { m_view->set_source(*source); @@ -274,7 +274,7 @@ HWND debugview_info::create_source_combobox(HWND parent, LONG_PTR userdata) } if (cursource != nullptr) { - SendMessage(result, CB_SETCURSEL, m_view->source_list().indexof(*cursource), 0); + SendMessage(result, CB_SETCURSEL, m_view->source_index(*cursource), 0); SendMessage(result, CB_SETDROPPEDWIDTH, ((maxlength + 2) * metrics().debug_font_width()) + metrics().vscroll_width(), 0); m_view->set_source(*cursource); } diff --git a/src/osd/modules/debugger/win/debugviewinfo.h b/src/osd/modules/debugger/win/debugviewinfo.h index 37d6930e445..fd48c7975bf 100644 --- a/src/osd/modules/debugger/win/debugviewinfo.h +++ b/src/osd/modules/debugger/win/debugviewinfo.h @@ -5,9 +5,10 @@ // debugviewinfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DEBUGVIEWINFO_H +#define MAME_DEBUGGER_WIN_DEBUGVIEWINFO_H -#ifndef __DEBUG_WIN_DEBUG_VIEW_INFO_H__ -#define __DEBUG_WIN_DEBUG_VIEW_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/debugwin.h b/src/osd/modules/debugger/win/debugwin.h index ea78f126d5b..e999b87334f 100644 --- a/src/osd/modules/debugger/win/debugwin.h +++ b/src/osd/modules/debugger/win/debugwin.h @@ -5,9 +5,10 @@ // debugwin.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DEBUGWIN_H +#define MAME_DEBUGGER_WIN_DEBUGWIN_H -#ifndef __DEBUG_WIN_DEBUG_WIN_H__ -#define __DEBUG_WIN_DEBUG_WIN_H__ +#pragma once // standard windows headers #include <windows.h> @@ -19,7 +20,6 @@ #endif - class debugview_info; class debugwin_info; class ui_metrics; diff --git a/src/osd/modules/debugger/win/debugwininfo.h b/src/osd/modules/debugger/win/debugwininfo.h index 2090985d3f9..b930189fffa 100644 --- a/src/osd/modules/debugger/win/debugwininfo.h +++ b/src/osd/modules/debugger/win/debugwininfo.h @@ -5,16 +5,16 @@ // debugwininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DEBUGWININFO_H +#define MAME_DEBUGGER_WIN_DEBUGWININFO_H -#ifndef __DEBUG_WIN_DEBUG_WIN_INFO_H__ -#define __DEBUG_WIN_DEBUG_WIN_INFO_H__ +#pragma once #include "debugwin.h" #include "debugbaseinfo.h" - class debugwin_info : protected debugbase_info { public: diff --git a/src/osd/modules/debugger/win/disasmbasewininfo.h b/src/osd/modules/debugger/win/disasmbasewininfo.h index 26cd481b7f6..c22f7f08e78 100644 --- a/src/osd/modules/debugger/win/disasmbasewininfo.h +++ b/src/osd/modules/debugger/win/disasmbasewininfo.h @@ -5,9 +5,10 @@ // disasmbasewininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DISASMBASEWININFO_H +#define MAME_DEBUGGER_WIN_DISASMBASEWININFO_H -#ifndef __DEBUG_WIN_DISASM_BASE_WIN_INFO_H__ -#define __DEBUG_WIN_DISASM_BASE_WIN_INFO_H__ +#pragma once #include "debugwin.h" @@ -27,4 +28,4 @@ protected: virtual bool handle_command(WPARAM wparam, LPARAM lparam) override; }; -#endif +#endif // MAME_DEBUGGER_WIN_DISASMBASEWININFO_H diff --git a/src/osd/modules/debugger/win/disasmviewinfo.h b/src/osd/modules/debugger/win/disasmviewinfo.h index d1e7090ef2f..a032475af7f 100644 --- a/src/osd/modules/debugger/win/disasmviewinfo.h +++ b/src/osd/modules/debugger/win/disasmviewinfo.h @@ -5,9 +5,10 @@ // disasmviewinfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DISASMVIEWINFO_H +#define MAME_DEBUGGER_WIN_DISASMVIEWINFO_H -#ifndef __DEBUG_WIN_DISASM_VIEW_INFO_H__ -#define __DEBUG_WIN_DISASM_VIEW_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/disasmwininfo.h b/src/osd/modules/debugger/win/disasmwininfo.h index 34e8275f2f9..71764bab0ef 100644 --- a/src/osd/modules/debugger/win/disasmwininfo.h +++ b/src/osd/modules/debugger/win/disasmwininfo.h @@ -5,9 +5,10 @@ // disasmwininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_DISASMWININFO_H +#define MAME_DEBUGGER_WIN_DISASMWININFO_H -#ifndef __DEBUG_WIN_DISASM_WIN_INFO_H__ -#define __DEBUG_WIN_DISASM_WIN_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/editwininfo.h b/src/osd/modules/debugger/win/editwininfo.h index 1aaee55f1e9..2156d8ba68d 100644 --- a/src/osd/modules/debugger/win/editwininfo.h +++ b/src/osd/modules/debugger/win/editwininfo.h @@ -5,9 +5,10 @@ // editwininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_EDITWININFO_H +#define MAME_DEBUGGER_WIN_EDITWININFO_H -#ifndef MAME_DEBUG_WIN_EDIT_WIN_INFO_H -#define MAME_DEBUG_WIN_EDIT_WIN_INFO_H +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/logviewinfo.h b/src/osd/modules/debugger/win/logviewinfo.h index da598038864..e2fa9d31643 100644 --- a/src/osd/modules/debugger/win/logviewinfo.h +++ b/src/osd/modules/debugger/win/logviewinfo.h @@ -5,9 +5,10 @@ // logviewinfo.h - Win32 debug log window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_LOGVIEWINFO_H +#define MAME_DEBUGGER_WIN_LOGVIEWINFO_H -#ifndef __DEBUG_WIN_LOG_VIEW_INFO_H__ -#define __DEBUG_WIN_LOG_VIEW_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/logwininfo.h b/src/osd/modules/debugger/win/logwininfo.h index a816b6f3da3..b40d184485e 100644 --- a/src/osd/modules/debugger/win/logwininfo.h +++ b/src/osd/modules/debugger/win/logwininfo.h @@ -5,9 +5,10 @@ // logwininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_LOGWININFO_H +#define MAME_DEBUGGER_WIN_LOGWININFO_H -#ifndef __DEBUG_WIN_LOG_WIN_INFO_H__ -#define __DEBUG_WIN_LOG_WIN_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/memoryviewinfo.h b/src/osd/modules/debugger/win/memoryviewinfo.h index 2ab810654f3..a897698f0bd 100644 --- a/src/osd/modules/debugger/win/memoryviewinfo.h +++ b/src/osd/modules/debugger/win/memoryviewinfo.h @@ -5,9 +5,10 @@ // memoryviewinfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_MEMORYVIEWINFO_H +#define MAME_DEBUGGER_WIN_MEMORYVIEWINFO_H -#ifndef __DEBUG_WIN_MEMORY_VIEW_INFO_H__ -#define __DEBUG_WIN_MEMORY_VIEW_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/memorywininfo.h b/src/osd/modules/debugger/win/memorywininfo.h index 501d7acc76f..e0436605707 100644 --- a/src/osd/modules/debugger/win/memorywininfo.h +++ b/src/osd/modules/debugger/win/memorywininfo.h @@ -5,9 +5,10 @@ // memorywininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_MEMORYWININFO_H +#define MAME_DEBUGGER_WIN_MEMORYWININFO_H -#ifndef __DEBUG_WIN_MEMORY_WIN_INFO_H__ -#define __DEBUG_WIN_MEMORY_WIN_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/pointswininfo.h b/src/osd/modules/debugger/win/pointswininfo.h index 8ba1b31fc00..4e36155105e 100644 --- a/src/osd/modules/debugger/win/pointswininfo.h +++ b/src/osd/modules/debugger/win/pointswininfo.h @@ -5,9 +5,10 @@ // pointswininfo.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_POINTSWININFO_H +#define MAME_DEBUGGER_WIN_POINTSWININFO_H -#ifndef __DEBUG_WIN_POINTS_WIN_INFO_H__ -#define __DEBUG_WIN_POINTS_WIN_INFO_H__ +#pragma once #include "debugwin.h" diff --git a/src/osd/modules/debugger/win/uimetrics.h b/src/osd/modules/debugger/win/uimetrics.h index a360d66924e..2687ada036c 100644 --- a/src/osd/modules/debugger/win/uimetrics.h +++ b/src/osd/modules/debugger/win/uimetrics.h @@ -5,9 +5,10 @@ // uimetrics.h - Win32 debug window handling // //============================================================ +#ifndef MAME_DEBUGGER_WIN_UIMETRICS_H +#define MAME_DEBUGGER_WIN_UIMETRICS_H -#ifndef __DEBUG_WIN_UI_METRICS_H__ -#define __DEBUG_WIN_UI_METRICS_H__ +#pragma once #include "debugwin.h" |