diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
| commit | cfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch) | |
| tree | 8016486f8ee7157213f2d09ff2491bfa9c94638a /lib/malloca.c | |
| parent | 14e4d584d0121031ec40e6c35869745f1747ff29 (diff) | |
| parent | 1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff) | |
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'lib/malloca.c')
| -rw-r--r-- | lib/malloca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/malloca.c b/lib/malloca.c index e75c72df..943140c8 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2024 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2026 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003, 2018. This file is free software: you can redistribute it and/or modify @@ -93,7 +93,7 @@ mmalloca (size_t n) /* Out of memory. */ return NULL; #else -# if !MALLOC_0_IS_NONNULL +# if !HAVE_MALLOC_0_NONNULL if (n == 0) n = 1; # endif @@ -118,7 +118,7 @@ freea (void *p) char *cp = p; small_t *sp = p; # if defined __CHERI_PURE_CAPABILITY__ - void *mem = sp[-1]; + void *mem = (void *) sp[-1]; # else void *mem = cp - sp[-1]; # endif |