summaryrefslogtreecommitdiffstats
path: root/options/path.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-04 11:43:02 +0100
committerwm4 <wm4@nowhere>2015-03-04 17:28:41 +0100
commit85bf102f54cfae9945d26f1edc0e642975881dfa (patch)
tree44a8805640644b30db8d7327314e0b19d5abe999 /options/path.c
parent0bbf36b796336c41ce8a7ef2054276254ba56067 (diff)
downloadmpv-85bf102f54cfae9945d26f1edc0e642975881dfa.tar.bz2
mpv-85bf102f54cfae9945d26f1edc0e642975881dfa.tar.xz
win32: fix some more -Wparentheses warnings
Stupid compiler. For decode_surrogate_pair(), I changed the order of evaluation; it shouldn't matter, but this order is more readable in my opinion.
Diffstat (limited to 'options/path.c')
-rw-r--r--options/path.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/options/path.c b/options/path.c
index 6ae0fc4d11..2b2bb3d272 100644
--- a/options/path.c
+++ b/options/path.c
@@ -240,7 +240,7 @@ char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2)
return bstrdup0(talloc_ctx, p1);
#if HAVE_DOS_PATHS
- if (p2.len >= 2 && p2.start[1] == ':'
+ if ((p2.len >= 2 && p2.start[1] == ':')
|| p2.start[0] == '\\' || p2.start[0] == '/')
#else
if (p2.start[0] == '/')
@@ -251,7 +251,7 @@ char *mp_path_join(void *talloc_ctx, struct bstr p1, struct bstr p2)
int endchar1 = p1.start[p1.len - 1];
#if HAVE_DOS_PATHS
have_separator = endchar1 == '/' || endchar1 == '\\'
- || p1.len == 2 && endchar1 == ':'; // "X:" only
+ || (p1.len == 2 && endchar1 == ':'); // "X:" only
#else
have_separator = endchar1 == '/';
#endif