ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use bare noreturn in log.h.

Browse source 
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
This commit is contained in:
Elliott Hughes 2017-01-03 13:17:42 -08:00
parent fd979edb57
commit 9b3b119912
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
liblog/legacy-ndk-includes/log.h
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
;