Merge "Don't use bare noreturn in log.h."

This commit is contained in:
Elliott Hughes 2017-01-04 00:37:17 +00:00 committed by Gerrit Code Review
commit fe05f1cde4

View file

@ -98,7 +98,7 @@ int __android_log_write(int prio, const char *tag, const char *text);
*/ */
int __android_log_print(int prio, const char *tag, const char *fmt, ...) int __android_log_print(int prio, const char *tag, const char *fmt, ...)
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((format(printf, 3, 4))) __attribute__((__format__(printf, 3, 4)))
#endif #endif
; ;
@ -116,8 +116,8 @@ int __android_log_vprint(int prio, const char *tag,
void __android_log_assert(const char *cond, const char *tag, void __android_log_assert(const char *cond, const char *tag,
const char *fmt, ...) const char *fmt, ...)
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((noreturn)) __attribute__((__noreturn__))
__attribute__ ((format(printf, 3, 4))) __attribute__((__format__(printf, 3, 4)))
#endif #endif
; ;