Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b3b1199 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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
parent fd979edb

liblog/legacy-ndk-includes/log.h

+3 −3
Original line number Diff line number Diff line
@@ -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

    ;