From 85bf102f54cfae9945d26f1edc0e642975881dfa Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 4 Mar 2015 11:43:02 +0100 Subject: 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. --- options/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'options/path.c') 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 -- cgit v1.2.3