From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 116369 invoked by alias); 14 Mar 2018 15:19:19 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 116312 invoked by uid 9642); 14 Mar 2018 15:19:19 -0000 Date: Wed, 14 Mar 2018 15:19:00 -0000 Message-ID: <20180314151919.116309.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Yaakov Selkowitz To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Fix alloc_align and alloc_size macros for multiple arguments X-Act-Checkin: newlib-cygwin X-Git-Author: Yaakov Selkowitz X-Git-Refname: refs/heads/master X-Git-Oldrev: 134f93f313db95c394b925716717031a05b2a6d3 X-Git-Newrev: e494b560350cabef94126a4478096aae89ae35a0 X-SW-Source: 2018-q1/txt/msg00059.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e494b560350cabef94126a4478096aae89ae35a0 commit e494b560350cabef94126a4478096aae89ae35a0 Author: Yaakov Selkowitz Date: Wed Mar 14 10:17:51 2018 -0500 Fix alloc_align and alloc_size macros for multiple arguments https://sourceware.org/ml/newlib/2018/msg00263.html This is a follow-up to commit 4564b30f331a067e71b25308ac7c8a85ceb4b122. Signed-off-by: Yaakov Selkowitz Diff: --- newlib/libc/include/stdlib.h | 4 ++-- newlib/libc/include/sys/cdefs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 593760a..564ce8a 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -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 fc564a5..b3f8d19 100644 --- a/newlib/libc/include/sys/cdefs.h +++ b/newlib/libc/include/sys/cdefs.h @@ -258,12 +258,12 @@ #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)) #else #define __alloc_size(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