From fd8ed23b56d7342e212888831d9be24449dd851e Mon Sep 17 00:00:00 2001 From: Andrea Date: Sun, 19 Feb 2023 09:46:07 +0000 Subject: [PATCH] 2 small fixes: enum comparison and include. (PR #1182) --- source/CmdLine.cpp | 1 - source/Debugger/Debugger_Disassembler.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/source/CmdLine.cpp b/source/CmdLine.cpp index 175ad8c2..4930ecce 100644 --- a/source/CmdLine.cpp +++ b/source/CmdLine.cpp @@ -37,7 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Joystick.h" #include "SoundCore.h" #include "SNESMAX.h" -#include "ParallelPrinter.h" #include "Interface.h" CmdLine g_cmdLine; diff --git a/source/Debugger/Debugger_Disassembler.cpp b/source/Debugger/Debugger_Disassembler.cpp index 3a2d916b..d6a0344e 100644 --- a/source/Debugger/Debugger_Disassembler.cpp +++ b/source/Debugger/Debugger_Disassembler.cpp @@ -451,7 +451,7 @@ int GetDisassemblyLine(WORD nBaseAddress, DisasmLine_t& line_) void FormatOpcodeBytes(WORD nBaseAddress, DisasmLine_t& line_) { // 2.8.0.0 fix // TODO: FIX: show max 8 bytes for HEX - const int nMaxOpBytes = min(line_.nOpbyte, DISASM_DISPLAY_MAX_OPCODES); + const int nMaxOpBytes = std::min(line_.nOpbyte, DISASM_DISPLAY_MAX_OPCODES); char* cp = line_.sOpCodes; const char* const ep = cp + sizeof(line_.sOpCodes);