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

am: a1d9edfbf3

Change-Id: I32e787af63a109c5ef27e6420e34936480706f51
This commit is contained in:
Elliott Hughes 2016-06-21 02:08:58 +00:00 committed by android-build-merger
commit 95bafa7cdd

View file

@ -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)))