diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/conf_post.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 817483be1fb..7a98555cc9c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2015-01-08 Paul Eggert <eggert@cs.ucla.edu> + * conf_post.h (ATTRIBUTE_ALLOC_SIZE): Port to clang 3.5.0. + Apparently clang removed support for the alloc_size attribute. + Port Qnil==0 XUNTAG to clang clang has undefined behavior if the program subtracts an integer from (char *) 0. Problem reported by YAMAMOTO Mitsuharu in: diff --git a/src/conf_post.h b/src/conf_post.h index 479d0448775..1a080fad635 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -245,7 +245,9 @@ extern void _DebPrint (const char *fmt, ...); # define ATTRIBUTE_MALLOC #endif -#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__) +#if (__clang__ \ + ? __has_attribute (alloc_size) \ + : 4 < __GNUC__ + (3 <= __GNUC_MINOR__)) # define ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args)) #else # define ATTRIBUTE_ALLOC_SIZE(args) |