ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #721 from Tetralux/fix-getcwd-allocator

Browse Source 
Fix os.get_current_directory() allocator
This commit is contained in:
gingerBill
2020-08-27 11:38:24 +01:00
committed by GitHub
parent 14e6cdb1a0 3820f27c7c
commit 0216ade2f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os_windows.odin
+2 -2
View File
@@ -271,7 +271,7 @@ get_page_size :: proc() -> int {
// The current directory is stored as a global variable in the process. // The current directory is stored as a global variable in the process.
@private cwd_gate := false; @private cwd_gate := false;
get_current_directory :: proc() -> string { get_current_directory :: proc(allocator := context.allocator) -> string {
for intrinsics.atomic_xchg(&cwd_gate, true) {} for intrinsics.atomic_xchg(&cwd_gate, true) {}
sz_utf16 := win32.GetCurrentDirectoryW(0, nil); sz_utf16 := win32.GetCurrentDirectoryW(0, nil);
@@ -282,7 +282,7 @@ get_current_directory :: proc() -> string {
intrinsics.atomic_store(&cwd_gate, false); intrinsics.atomic_store(&cwd_gate, false);
return win32.utf16_to_utf8(dir_buf_wstr); return win32.utf16_to_utf8(dir_buf_wstr, allocator);
} }
set_current_directory :: proc(path: string) -> (err: Errno) { set_current_directory :: proc(path: string) -> (err: Errno) {