diff --git a/core/runtime/default_allocators_windows.odin b/core/runtime/default_allocators_windows.odin index 64b2dd23e..15c74ab19 100644 --- a/core/runtime/default_allocators_windows.odin +++ b/core/runtime/default_allocators_windows.odin @@ -3,10 +3,10 @@ package runtime default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, size, alignment: int, - old_memory: rawptr, old_size: int, loc := #caller_location) -> ([]byte, Allocator_Error) { + old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) { switch mode { case .Alloc: - return _windows_default_alloc(size, alignment); + data, err = _windows_default_alloc(size, alignment); case .Free: _windows_default_free(old_memory); @@ -15,20 +15,19 @@ default_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, // NOTE(tetra): Do nothing. case .Resize: - return _windows_default_resize(old_memory, old_size, size, alignment); + data, err = _windows_default_resize(old_memory, old_size, size, alignment); case .Query_Features: set := (^Allocator_Mode_Set)(old_memory); if set != nil { set^ = {.Alloc, .Free, .Resize, .Query_Features}; } - return nil, nil; case .Query_Info: - return nil, nil; + // Do nothing } - return nil, nil; + return; } default_allocator :: proc() -> Allocator {