commit 6e39ece6ec4b6dd40b1ad0407d48de7fa46a14a7
author Elliott Hughes <enh@google.com> Tue Jun 21 02:02:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 02:02:25 2016 +0000
tree 1ab8f2e84ef18aea21c38c137e684d1af537168f
parent b28f060b19a68c34a209ff97ea3465b26c2a8e68
parent 6d127b8437cef2d357a30af7ba8548d1ace2daef

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

Change-Id: I93779cd1785db5d277df21dffe1896edd40df7fb

include/android/log.h

diff --git a/include/android/log.h b/include/android/log.h
index 1c171b7..2956e6e 100644
--- a/include/android/log.h
+++ b/include/android/log.h
@@ -124,7 +124,7 @@
 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)))