diff options
| author | gingerBill <bill@gingerbill.org> | 2022-03-03 13:56:34 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-03-03 13:56:34 +0000 |
| commit | fcab5508be19ac071a19f392bcd1824e3806af95 (patch) | |
| tree | 770f7a3a85d94d56eae5f69cd4fb7e23d7d63c6d /src/common.cpp | |
| parent | ad6ea3d6aa564ad228cf8883a8fd858135a16030 (diff) | |
| parent | 0b05650366258a56c8da17848e238a21a377afb3 (diff) | |
Merge branch 'master' into odin-ast-changes
Diffstat (limited to 'src/common.cpp')
| -rw-r--r-- | src/common.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common.cpp b/src/common.cpp index ab2a46118..aaacda04b 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -848,7 +848,7 @@ ReadDirectoryError read_directory(String path, Array<FileInfo> *fi) { return ReadDirectory_None; } -#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) +#elif defined(GB_SYSTEM_LINUX) || defined(GB_SYSTEM_OSX) || defined(GB_SYSTEM_FREEBSD) || defined(GB_SYSTEM_OPENBSD) #include <dirent.h> @@ -1021,7 +1021,7 @@ LoadedFileError load_file_32(char const *fullpath, LoadedFile *memory_mapped_fil #endif } - gbFileContents fc = gb_file_read_contents(heap_allocator(), true, fullpath); + gbFileContents fc = gb_file_read_contents(permanent_allocator(), true, fullpath); if (fc.size > I32_MAX) { err = LoadedFile_FileTooLarge; |