procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

compiler.h: for newer gcc attributes, we can use __has_attribute()

Browse source 
For newer gcc attributes, we can use __has_attribute() to test for
attribute presence.  This improves compatibility both with older gcc
and with clang, at least with -Werror enabled.

Reported-by: Daniel Lundqvist <daniel@malarhojden.nu>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2016-10-14 15:01:06 -07:00
parent 9df6b4c8c2
commit 9b733a5845
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/compiler.h
View file

@ -180,15 +180,25 @@ char *strsep(char **, const char *);
#if defined(__GNUC__) && __GNUC__ >= 4 /* ? */
# define never_null __attribute__((returns_nonnull))
# define safe_alloc never_null __attribute__((malloc))
# define safe_malloc(s) safe_alloc __attribute__((alloc_size(s)))
# define safe_malloc2(s1,s2) safe_alloc __attribute__((alloc_size(s1,s2)))
# define safe_realloc(s) never_null __attribute__((alloc_size(s)))
#else
# ifdef __has_attribute
# if __has_attribute(alloc_size)
# define safe_malloc(s) safe_alloc __attribute__((alloc_size(s)))
# define safe_malloc2(s1,s2) safe_alloc __attribute__((alloc_size(s1,s2)))
# define safe_realloc(s) never_null __attribute__((alloc_size(s)))
# endif
# endif
#endif
#ifndef never_null
# define never_null
#endif
#ifndef safe_alloc
# define safe_alloc
# define safe_malloc(s)
# define safe_malloc2(s1,s2)
# define safe_realloc(s)
#endif
#ifndef safe_malloc
# define safe_malloc(s) safe_alloc
# define safe_malloc2(s1,s2) save_alloc
# define safe_realloc(s) never_null
#endif
/*