From 9b3b119912fb76ebc3d964080ab504cd5768197c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 3 Jan 2017 13:17:42 -0800 Subject: [PATCH] Don't use bare `noreturn` in log.h. toybox has a #define noreturn that trips over this. Also move `format` out of the way, just in case. Bug: https://github.com/android-ndk/ndk/issues/271 Test: builds Change-Id: Ib8811136b4b422ff74625509539a5464a3c9af18 --- liblog/legacy-ndk-includes/log.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liblog/legacy-ndk-includes/log.h b/liblog/legacy-ndk-includes/log.h index 0ea4c298b..d40d6fa9a 100644 --- a/liblog/legacy-ndk-includes/log.h +++ b/liblog/legacy-ndk-includes/log.h @@ -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 ;