diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-07-26 10:36:06 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-07-30 10:47:57 +0200 |
| commit | a31a7bad6a26bd64ef017e95d6ee0e994b6ca87b (patch) | |
| tree | 03ce4d6e438b070f6243effeff88634bd1d6b1df | |
| parent | 271e856a49731edb88427f4a7aeb388825e366c3 (diff) | |
| download | cygnal-a31a7bad6a26bd64ef017e95d6ee0e994b6ca87b.tar.gz cygnal-a31a7bad6a26bd64ef017e95d6ee0e994b6ca87b.tar.bz2 cygnal-a31a7bad6a26bd64ef017e95d6ee0e994b6ca87b.zip | |
FreeBSD compat. __alloc_size(), __alloc_align()
Restore FreeBSD compatibility for __alloc_size() and __alloc_align().
This is a follow-up to commit e494b560350cabef94126a4478096aae89ae35a0.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
| -rw-r--r-- | newlib/libc/include/stdlib.h | 6 | ||||
| -rw-r--r-- | newlib/libc/include/sys/cdefs.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 564ce8a28..a805736e7 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -140,7 +140,7 @@ void qsort (void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar); int rand (void); void * realloc (void *__r, size_t __size) _NOTHROW; #if __BSD_VISIBLE -void *reallocarray(void *, size_t, size_t) __result_use_check __alloc_size((2,3)); +void *reallocarray(void *, size_t, size_t) __result_use_check __alloc_size2(2, 3); void * reallocf (void *__r, size_t __size); #endif #if __BSD_VISIBLE || __XSI_VISIBLE >= 4 @@ -324,8 +324,8 @@ extern long double strtold (const char *__restrict, char **__restrict); * If we're in a mode greater than C99, expose C11 functions. */ #if __ISO_C_VISIBLE >= 2011 -void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align((1)) - __alloc_size((2)); +void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) + __alloc_size(2); int at_quick_exit(void (*)(void)); _Noreturn void quick_exit(int); diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h index 7c2aa3bc1..ccb47ea40 100644 --- a/newlib/libc/include/sys/cdefs.h +++ b/newlib/libc/include/sys/cdefs.h @@ -249,14 +249,14 @@ #define __section(x) __attribute__((__section__(x))) #endif #if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) -#define __alloc_size(x) __attribute__((__alloc_size__ x)) +#define __alloc_size(x) __attribute__((__alloc_size__(x))) #define __alloc_size2(n, x) __attribute__((__alloc_size__(n, x))) #else #define __alloc_size(x) #define __alloc_size2(n, x) #endif #if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__) -#define __alloc_align(x) __attribute__((__alloc_align__ x)) +#define __alloc_align(x) __attribute__((__alloc_align__(x))) #else #define __alloc_align(x) #endif |