diff options
author | RobertoFresca <robertofresca@recreativas.org> | 2021-01-21 00:07:27 +0100 |
---|---|---|
committer | RobertoFresca <robertofresca@recreativas.org> | 2021-01-21 00:07:27 +0100 |
commit | aa7c66968f64b126c0a59edb45475bcda25eb212 (patch) | |
tree | 3915c3d588477dc0c02fb39c9af585ccbaf7a56b /src/mame | |
parent | 64aea444f670b53699f395abc07c66830fc68cd0 (diff) | |
parent | 91921618c2e06bd0ed073b8efccd31a127c9012d (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/esq5505.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/bfm_sc45_helper.cpp | 10 | ||||
-rw-r--r-- | src/mame/machine/lynx.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/spec_snqk.cpp | 1 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp index eee7fd1fdae..211a082c5bc 100644 --- a/src/mame/drivers/esq5505.cpp +++ b/src/mame/drivers/esq5505.cpp @@ -323,7 +323,7 @@ void esq5505_state::machine_reset() // on VFX, bit 0 is 1 for 'cartridge present'. // on VFX-SD and later, bit 0 is2 1 for floppy present, bit 1 is 1 for cartridge present - if (core_stricmp(machine().system().name, "vfx") == 0) + if (strcmp(machine().system().name, "vfx") == 0) { // todo: handle VFX cart-in when we support cartridges m_duart->ip0_w(ASSERT_LINE); diff --git a/src/mame/machine/bfm_sc45_helper.cpp b/src/mame/machine/bfm_sc45_helper.cpp index a815759bc63..7e735e59dc7 100644 --- a/src/mame/machine/bfm_sc45_helper.cpp +++ b/src/mame/machine/bfm_sc45_helper.cpp @@ -6,6 +6,7 @@ */ #include "emu.h" +#include "corestr.h" //#define sc45helperlog printf #define sc45helperlog machine.logerror @@ -209,8 +210,7 @@ int find_input_strings(running_machine &machine) } - strtrimspace(tempstring); - strmakelower(tempstring); + tempstring = strmakelower(strtrimspace(tempstring)); //if (pos <= 5) @@ -498,8 +498,7 @@ int find_lamp_strings(running_machine &machine) lamps[row][col].lampname = tempstring; lamps[row][col].lamptypename = "matrixlamp"; - strtrimspace(lamps[row][col].lampname); - strmakelower(lamps[row][col].lampname); + lamps[row][col].lampname = strmakelower(strtrimspace(lamps[row][col].lampname)); } else { @@ -895,8 +894,7 @@ int find_reel_strings(running_machine &machine) } - strtrimspace(tempstring); - strmakelower(tempstring); + tempstring = strmakelower(strtrimspace(tempstring)); if (tempstring[0] == '!') { diff --git a/src/mame/machine/lynx.cpp b/src/mame/machine/lynx.cpp index 3f8fa1200a3..161359d5d11 100644 --- a/src/mame/machine/lynx.cpp +++ b/src/mame/machine/lynx.cpp @@ -7,6 +7,8 @@ #include "emu.h" #include "includes/lynx.h" #include "cpu/m6502/m65sc02.h" + +#include "corestr.h" #include "render.h" #define PAD_UP 0x80 diff --git a/src/mame/machine/spec_snqk.cpp b/src/mame/machine/spec_snqk.cpp index f5b4dc5f3c0..e714fc0be5d 100644 --- a/src/mame/machine/spec_snqk.cpp +++ b/src/mame/machine/spec_snqk.cpp @@ -36,6 +36,7 @@ #include "includes/specpls3.h" #include "sound/ay8910.h" #include "machine/spec_snqk.h" +#include "corestr.h" #define EXEC_NA "N/A" |