Merge branch 'master' into objc-intrinsics

This commit is contained in:
gingerBill
2022-02-12 21:49:48 +00:00
3 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -79,7 +79,7 @@ jobs:
make
timeout-minutes: 10
build_windows:
runs-on: windows-latest
runs-on: windows-2019
steps:
- uses: actions/checkout@v1
- name: build Odin
+1 -1
View File
@@ -7,7 +7,7 @@ on:
jobs:
build_windows:
runs-on: windows-latest
runs-on: windows-2019
steps:
- uses: actions/checkout@v1
- name: build Odin
+1 -2
View File
@@ -227,11 +227,10 @@ glob :: proc(pattern: string, allocator := context.allocator) -> (matches: []str
return m[:], .None
}
temp_buf: [8]byte
dir, file := split(pattern)
volume_len := 0
when ODIN_OS == "windows" {
temp_buf: [8]byte
volume_len, dir = clean_glob_path_windows(dir, temp_buf[:])
} else {
dir = clean_glob_path(dir)