aboutsummaryrefslogtreecommitdiff
path: root/std/debug/index.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-02-07 00:49:06 -0500
committerAndrew Kelley <andrew@ziglang.org>2019-02-07 00:49:06 -0500
commit7fc99c33bde54e3f4bc946e7e00351bf594daa37 (patch)
tree5ecb89cb50e08dc7032e31c84128f5d32d20d315 /std/debug/index.zig
parent8a5d3e2eaf72195993e4932bfda66d08a36c6064 (diff)
parent36bade5c562bf0b2479b6dfdd465a1a312890835 (diff)
downloadzig-7fc99c33bde54e3f4bc946e7e00351bf594daa37.tar.gz
zig-7fc99c33bde54e3f4bc946e7e00351bf594daa37.zip
Merge branch 'kristate-zig-backport-std.os.path'
Diffstat (limited to 'std/debug/index.zig')
-rw-r--r--std/debug/index.zig4
1 files changed, 2 insertions, 2 deletions
diff --git a/std/debug/index.zig b/std/debug/index.zig
index b4ef849509..a1e2747df5 100644
--- a/std/debug/index.zig
+++ b/std/debug/index.zig
@@ -774,7 +774,7 @@ fn openSelfDebugInfoWindows(allocator: *mem.Allocator) !DebugInfo {
const len = try di.coff.getPdbPath(path_buf[0..]);
const raw_path = path_buf[0..len];
- const path = try os.path.resolve(allocator, raw_path);
+ const path = try os.path.resolve(allocator, [][]const u8{raw_path});
try di.pdb.openFile(di.coff, path);
@@ -1352,7 +1352,7 @@ const LineNumberProgram = struct {
return error.InvalidDebugInfo;
} else
self.include_dirs[file_entry.dir_index];
- const file_name = try os.path.join(self.file_entries.allocator, dir_name, file_entry.file_name);
+ const file_name = try os.path.join(self.file_entries.allocator, [][]const u8{ dir_name, file_entry.file_name });
errdefer self.file_entries.allocator.free(file_name);
return LineInfo{
.line = if (self.prev_line >= 0) @intCast(usize, self.prev_line) else 0,