diff options
| author | Tadeo hepperle <tadeo@do-mix.de> | 2024-06-26 19:31:00 +0200 |
|---|---|---|
| committer | Tadeo hepperle <tadeo@do-mix.de> | 2024-06-26 19:31:00 +0200 |
| commit | 67e69f719648704c9fa118dcc7cb052d8ab30608 (patch) | |
| tree | d28d893b51ba0796d41bd4fe6b86133cd3c0eb40 /base/runtime/heap_allocator.odin | |
| parent | 18dadd94e3a91d1eed5938f4998b8b7a71765afb (diff) | |
| parent | 8d1827838fb902be4f16b3b028ac0d299a456857 (diff) | |
Merge branch 'master' into fix-vulkan-codegen-arrays-as-proc-args
Diffstat (limited to 'base/runtime/heap_allocator.odin')
| -rw-r--r-- | base/runtime/heap_allocator.odin | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/runtime/heap_allocator.odin b/base/runtime/heap_allocator.odin index 75f79ab77..cdad8690e 100644 --- a/base/runtime/heap_allocator.odin +++ b/base/runtime/heap_allocator.odin @@ -97,14 +97,14 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, } -heap_alloc :: proc(size: int, zero_memory := true) -> rawptr { +heap_alloc :: proc "contextless" (size: int, zero_memory := true) -> rawptr { return _heap_alloc(size, zero_memory) } -heap_resize :: proc(ptr: rawptr, new_size: int) -> rawptr { +heap_resize :: proc "contextless" (ptr: rawptr, new_size: int) -> rawptr { return _heap_resize(ptr, new_size) } -heap_free :: proc(ptr: rawptr) { +heap_free :: proc "contextless" (ptr: rawptr) { _heap_free(ptr) }
\ No newline at end of file |