diff --git a/core/c/frontend/preprocessor/preprocess.odin b/core/c/frontend/preprocessor/preprocess.odin index 9651cc81c..1db3fafa3 100644 --- a/core/c/frontend/preprocessor/preprocess.odin +++ b/core/c/frontend/preprocessor/preprocess.odin @@ -1276,7 +1276,7 @@ preprocess_internal :: proc(cpp: ^Preprocessor, tok: ^Token) -> ^Token { if start.file != nil { dir = filepath.dir(start.file.name) } - path := filepath.join(dir, filename) + path := filepath.join({dir, filename}) if os.exists(path) { tok = include_file(cpp, tok, path, start.next.next) continue diff --git a/core/path/filepath/match.odin b/core/path/filepath/match.odin index 252912710..00a9c9fb0 100644 --- a/core/path/filepath/match.odin +++ b/core/path/filepath/match.odin @@ -305,7 +305,7 @@ _glob :: proc(dir, pattern: string, matches: ^[dynamic]string, allocator := cont n := fi.name matched := match(pattern, n) or_return if matched { - append(&m, join(dir, n)) + append(&m, join({dir, n})) } } return diff --git a/core/path/filepath/path_unix.odin b/core/path/filepath/path_unix.odin index d0eaa3635..8faf6097c 100644 --- a/core/path/filepath/path_unix.odin +++ b/core/path/filepath/path_unix.odin @@ -38,7 +38,7 @@ abs :: proc(path: string, allocator := context.allocator) -> (string, bool) { return path_str, true } -join :: proc(elems: ..string, allocator := context.allocator) -> string { +join :: proc(elems: []string, allocator := context.allocator) -> string { for e, i in elems { if e != "" { p := strings.join(elems[i:], SEPARATOR_STRING, context.temp_allocator) diff --git a/core/path/filepath/path_windows.odin b/core/path/filepath/path_windows.odin index 28238dd6e..cdfe3ddbb 100644 --- a/core/path/filepath/path_windows.odin +++ b/core/path/filepath/path_windows.odin @@ -88,7 +88,7 @@ abs :: proc(path: string, allocator := context.allocator) -> (string, bool) { } -join :: proc(elems: ..string, allocator := context.allocator) -> string { +join :: proc(elems: []string, allocator := context.allocator) -> string { for e, i in elems { if e != "" { return join_non_empty(elems[i:], allocator)