diff options
author | 2021-08-27 11:20:17 +1000 | |
---|---|---|
committer | 2021-08-27 11:20:17 +1000 | |
commit | 7000a5202a4d4ab649622ff29551bae4fce93087 (patch) | |
tree | 08a5342bf63ba0c44414cd40056f935815d372e5 /src | |
parent | 81a659749cdc71d270bbeac64b91690827416c7b (diff) | |
parent | ec9ba6fa76c3941272786e20232a1fcfc68594f3 (diff) |
Merge tag 'mame0235' into mainline-master
MAME 0.235
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/sound/ks0164.cpp | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 1 | ||||
-rw-r--r-- | src/lib/util/zippath.cpp | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/devices/sound/ks0164.cpp b/src/devices/sound/ks0164.cpp index 8fdcbf026ba..3431c49c0f7 100644 --- a/src/devices/sound/ks0164.cpp +++ b/src/devices/sound/ks0164.cpp @@ -421,7 +421,7 @@ u16 ks0164_device::uncomp_8_16(u8 value) s16 o = (0x10 | (value & 0xf)) << 10; o = o >> xp; if(value & 0x10) - o = -o; + o = -o; return o; } diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index f6b17941e0c..362615468e5 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -11,7 +11,6 @@ #include <array> #include <map> -#include <map> #include <stack> #include <type_traits> #include <utility> diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp index f317319c8c3..9d2e51a6833 100644 --- a/src/lib/util/zippath.cpp +++ b/src/lib/util/zippath.cpp @@ -48,7 +48,9 @@ int is_path_separator(char c) bool is_root(std::string_view path) { -#if defined(OSD_WINDOWS) +#if defined(WIN32) + // FIXME: don't assume paths are DOS-like - UNC paths, \\?\ long path prefix, etc. complicate this + // skip drive letter if (path.length() >= 2 && isalpha(path[0]) && (path[1] == ':')) path.remove_prefix(2); @@ -56,6 +58,7 @@ bool is_root(std::string_view path) // skip path separators return path.find_first_not_of(PATH_SEPARATOR) == std::string_view::npos; #else + // FIXME: handle multiple successive path separators, current directory references, parent directory references return (path.length() == 1) && (path[0] == '/'); #endif } |