From b0e330b68c161adfc5cffededd6703b6450562d5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 22 Mar 2015 15:05:13 -0400 Subject: [PATCH] Fix the build The world would be a better place if gcc had __has_feature(), too. --- glib/gmacros.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/glib/gmacros.h b/glib/gmacros.h index 735db2ba9..3b9a6b091 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -63,8 +63,13 @@ #define G_GNUC_NULL_TERMINATED #endif +/* Clang feature detection: http://clang.llvm.org/docs/LanguageExtensions.html */ +#ifndef __has_feature +#define __has_feature(x) 0 +#endif + #if (!defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || \ - (defined(__clang__) && __has_attribute(__alloc_size__)) + (defined(__clang__) && __has_feature(__alloc_size__)) #define G_GNUC_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) #define G_GNUC_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y))) #else @@ -159,11 +164,6 @@ #endif /* !__GNUC__ */ #endif /* !G_DISABLE_DEPRECATED */ -/* Clang feature detection: http://clang.llvm.org/docs/LanguageExtensions.html */ -#ifndef __has_feature -#define __has_feature(x) 0 -#endif - #if __has_feature(attribute_analyzer_noreturn) #define G_ANALYZER_ANALYZING 1 #define G_ANALYZER_NORETURN __attribute__((analyzer_noreturn))