diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-11-28 04:21:16 -0600 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2017-11-28 10:26:29 -0600 |
| commit | 36a0a675b4fd1c3cb3370367edb4ba2b457d008f (patch) | |
| tree | 1a69717af80da4f0c9c505d96a963eefaf4ab913 | |
| parent | f2b27ce620b98c3cd3bc22b7e2207a9e89eec3d8 (diff) | |
| download | newlib-36a0a675b4fd1c3cb3370367edb4ba2b457d008f.zip newlib-36a0a675b4fd1c3cb3370367edb4ba2b457d008f.tar.gz newlib-36a0a675b4fd1c3cb3370367edb4ba2b457d008f.tar.bz2 | |
Make __nonnull macro compatible with glibc
This form allows for multiple arguments, e.g. __nonnull((1,2)).
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
| -rw-r--r-- | newlib/libc/include/pthread.h | 4 | ||||
| -rw-r--r-- | newlib/libc/include/stdlib.h | 2 | ||||
| -rw-r--r-- | newlib/libc/include/string.h | 2 | ||||
| -rw-r--r-- | 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 <sys/string.h> 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) |