diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:07:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:07:35 +0200 |
| commit | fa23d938c040bc8af305a31fa874df55b2a02576 (patch) | |
| tree | 9704e2f7bd8962ea8911cd6f4e2d37227d7eff2e /lib/malloca.c | |
| parent | df9dbf9b0915e432a4a2c4182f60af36374eaaab (diff) | |
| parent | 693ae7b71dfdd1a8146266b5794a71c0dbe5dff0 (diff) | |
Merge branch 'feature/upstream' into develop
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..4bce9a3d 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-2025 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 |