diff options
| author | gingerBill <bill@gingerbill.org> | 2024-02-08 13:41:07 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2024-02-08 13:41:07 +0000 |
| commit | 3aea2e1fff4c60759665fe5da28a6fba593943c8 (patch) | |
| tree | fce4b265e15f6a0166003f3fb9a290d6b964110f /src | |
| parent | 59933b244ded0ab2476535b18875de95cd9f47bc (diff) | |
| parent | 7034a317454607ccfe4713ce09f256596877eb4b (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_settings.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 9a773f9d3..0bcb9f298 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -907,7 +907,7 @@ gb_internal String internal_odin_root_dir(void) { text = gb_alloc_array(permanent_allocator(), u8, len + 1); gb_memmove(text, &path_buf[0], len); - path = path_to_fullpath(heap_allocator(), make_string(text, len)); + path = path_to_fullpath(heap_allocator(), make_string(text, len), nullptr); for (i = path.len-1; i >= 0; i--) { u8 c = path[i]; @@ -1072,7 +1072,7 @@ gb_internal String internal_odin_root_dir(void) { gb_memmove(text, &path_buf[0], len); - path = path_to_fullpath(heap_allocator(), make_string(text, len)); + path = path_to_fullpath(heap_allocator(), make_string(text, len), nullptr); for (i = path.len-1; i >= 0; i--) { u8 c = path[i]; if (c == '/' || c == '\\') { @@ -1126,7 +1126,7 @@ gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) { return result; } #elif defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_UNIX) -gb_internal String path_to_fullpath(gbAllocator a, String s) { +gb_internal String path_to_fullpath(gbAllocator a, String s, bool *ok_) { char *p; mutex_lock(&fullpath_mutex); p = realpath(cast(char *)s.text, 0); |