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

am: 3f789b70ea

Change-Id: I5f5d65daaf5d6b9e006463960da50a33e9f8bfd3
This commit is contained in:
Elliott Hughes 2017-01-04 00:44:30 +00:00 committed by android-build-merger
commit ed5555ed8a

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, ...)
#if defined(__GNUC__)
__attribute__ ((format(printf, 3, 4)))
__attribute__((__format__(printf, 3, 4)))
#endif
;
@ -116,8 +116,8 @@ 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__ ((format(printf, 3, 4)))
__attribute__((__noreturn__))
__attribute__((__format__(printf, 3, 4)))
#endif
;