Commit eda044a2 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into 1954-basop-PortFlpMr2069

parents 9b18ec6c 4707ded0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ static int null_in_list(void **list, int n)
/* return pointer to aligned base + base_size, *base_size += size + 4 bytes align */
void *balloc(void *base, size_t *base_size, size_t size)
{
    uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & ~3;
    uintptr_t ptr = ((uintptr_t)base + *base_size + 3) & (uintptr_t)(~3);
    assert((uintptr_t)base % 4 == 0); /* base must be 4-byte aligned */
    *base_size = (*base_size + size + 3) & ~3;
    *base_size = (*base_size + size + 3) & (uintptr_t)(~3);
    return (void *)ptr;
}

+2 −2

File changed.

Contains only whitespace changes.