diff options
| author | gingerBill <bill@gingerbill.org> | 2024-06-06 13:02:16 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2024-06-06 13:02:16 +0100 |
| commit | c4ef8e7f6ceb4e2ce5d4869931d8f82afc1eb44c (patch) | |
| tree | b7adc511b3c0bc88b17def7a334424baf8829f8c /base/runtime/default_allocators_general.odin | |
| parent | 155516b897450ec265cfb53b6e32db90f15544f5 (diff) | |
| parent | 9b66b0c8e6a934a1dc4ab68cfc02652e7a26c179 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
Diffstat (limited to 'base/runtime/default_allocators_general.odin')
| -rw-r--r-- | base/runtime/default_allocators_general.odin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/runtime/default_allocators_general.odin b/base/runtime/default_allocators_general.odin index ab4dd1db8..64af6c904 100644 --- a/base/runtime/default_allocators_general.odin +++ b/base/runtime/default_allocators_general.odin @@ -6,7 +6,7 @@ when ODIN_DEFAULT_TO_NIL_ALLOCATOR { } else when ODIN_DEFAULT_TO_PANIC_ALLOCATOR { default_allocator_proc :: panic_allocator_proc default_allocator :: panic_allocator -} else when ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32 { +} else when ODIN_OS != .Orca && (ODIN_ARCH == .wasm32 || ODIN_ARCH == .wasm64p32) { default_allocator :: default_wasm_allocator default_allocator_proc :: wasm_allocator_proc } else { |