Make __nonnull macro compatible with glibc

Message ID 20171128102523.11808-1-yselkowi@redhat.com
State New
Headers show
Series
  • Make __nonnull macro compatible with glibc
Related show

Commit Message

Yaakov Selkowitz Nov. 28, 2017, 10:25 a.m.
This form allows for multiple arguments, e.g. __nonnull((1,2)).

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---
 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(-)

-- 
2.15.0

Comments

Corinna Vinschen Nov. 28, 2017, 12:27 p.m. | #1
On Nov 28 04:25, Yaakov Selkowitz wrote:
> This form allows for multiple arguments, e.g. __nonnull((1,2)).

> 

> Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>


ACK


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer
Red Hat

Patch

diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index 516131d83..fb2fa93d8 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 968367f22..af5bfecf1 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 9c536f35f..57db7742b 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 8ce14b68e..db5f2bf2d 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)