From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 99981 invoked by alias); 28 Nov 2017 16:28:01 -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 99800 invoked by uid 9642); 28 Nov 2017 16:28:01 -0000 Date: Tue, 28 Nov 2017 16:28:00 -0000 Message-ID: <20171128162801.99794.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] Make __nonnull macro compatible with glibc X-Act-Checkin: newlib-cygwin X-Git-Author: Yaakov Selkowitz X-Git-Refname: refs/heads/master X-Git-Oldrev: f2b27ce620b98c3cd3bc22b7e2207a9e89eec3d8 X-Git-Newrev: 36a0a675b4fd1c3cb3370367edb4ba2b457d008f X-SW-Source: 2017-q4/txt/msg00025.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=36a0a675b4fd1c3cb3370367edb4ba2b457d008f commit 36a0a675b4fd1c3cb3370367edb4ba2b457d008f Author: Yaakov Selkowitz Date: Tue Nov 28 04:21:16 2017 -0600 Make __nonnull macro compatible with glibc This form allows for multiple arguments, e.g. __nonnull((1,2)). Signed-off-by: Yaakov Selkowitz Diff: --- newlib/libc/include/pthread.h | 4 ++-- newlib/libc/include/stdlib.h | 2 +- newlib/libc/include/string.h | 2 +- newlib/libc/include/sys/cdefs.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h index 516131d..fb2fa93 100644 --- a/newlib/libc/include/pthread.h +++ b/newlib/libc/include/pthread.h @@ -171,9 +171,9 @@ int _EXFUN(pthread_setschedprio, (pthread_t thread, int prio)); #endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */ #if __GNU_VISIBLE -int pthread_getname_np(pthread_t, char *, size_t) __nonnull(2); +int pthread_getname_np(pthread_t, char *, size_t) __nonnull((2)); -int pthread_setname_np(pthread_t, const char *) __nonnull(2); +int pthread_setname_np(pthread_t, const char *) __nonnull((2)); #endif #if defined(_POSIX_THREAD_PRIO_INHERIT) || defined(_POSIX_THREAD_PRIO_PROTECT) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 968367f..af5bfec 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -282,7 +282,7 @@ int _EXFUN(_unsetenv_r,(struct _reent *, const char *__string)); #endif /* !__CYGWIN__ */ #if __POSIX_VISIBLE >= 200112 -int _EXFUN(__nonnull (1) posix_memalign,(void **, size_t, size_t)); +int _EXFUN(__nonnull ((1)) posix_memalign,(void **, size_t, size_t)); #endif char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**)); diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index 9c536f3..57db774 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -169,7 +169,7 @@ int _EXFUN(strverscmp,(const char *, const char *)); sure here. */ #if __GNU_VISIBLE && !defined(basename) # define basename basename -char *_EXFUN(__nonnull (1) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename")); +char *_EXFUN(__nonnull ((1)) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename")); #endif #include diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h index 8ce14b6..db5f2bf 100644 --- a/newlib/libc/include/sys/cdefs.h +++ b/newlib/libc/include/sys/cdefs.h @@ -397,7 +397,7 @@ #endif #if __GNUC_PREREQ__(3, 3) -#define __nonnull(x) __attribute__((__nonnull__(x))) +#define __nonnull(x) __attribute__((__nonnull__ x)) #define __nonnull_all __attribute__((__nonnull__)) #else #define __nonnull(x)