Merge \\\"Use __ with attribute __noreturn__ to avoid colliding with noreturn.\\\" am: e0dfd2a00e am: a1d9edfbf3

am: 95bafa7cdd Change-Id: Icd04c56368113feb86d1cf9d66a1e04124e5ef58
2016-06-21 02:12:01 +00:00 · 2016-06-21 02:12:01 +00:00 · 9f240487dd
parent f94a0826a4 95bafa7cdd
commit 9f240487dd
1 changed files with 1 additions and 1 deletions
--- a/include/android/log.h
+++ b/include/android/log.h
@ -124,7 +124,7 @@ int __android_log_vprint(int prio, const char *tag,
 void __android_log_assert(const char *cond, const char *tag,
                          const char *fmt, ...)
 #if defined(__GNUC__)
-    __attribute__ ((noreturn))
+    __attribute__ ((__noreturn__))
 #ifdef __USE_MINGW_ANSI_STDIO
 #if __USE_MINGW_ANSI_STDIO
    __attribute__ ((format(gnu_printf, 3, 4)))