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

Commit e2f498e1 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "liblog: remove checks for __GNUC__" 

am: 5f8790f8

Change-Id: I6d78df11ab8c1c263733acf41e645524589bab68
parents 5d1428b4 5f8790f8

liblog/include/android/log.h

+7 −23
Original line number Diff line number Diff line
@@ -96,20 +96,14 @@ int __android_log_write(int prio, const char* tag, const char* text); 
 * [printf(3)](http://man7.org/linux/man-pages/man3/printf.3.html).

 */

int __android_log_print(int prio, const char* tag, const char* fmt, ...)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 3, 4)))

#endif

    ;

    __attribute__((__format__(printf, 3, 4)));



/**

 * Equivalent to `__android_log_print`, but taking a `va_list`.

 * (If `__android_log_print` is like `printf`, this is like `vprintf`.)

 */

int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 3, 0)))

#endif

    ;

    __attribute__((__format__(printf, 3, 0)));



/**

 * Writes an assertion failure to the log (as `ANDROID_LOG_FATAL`) and to
@@ -127,13 +121,8 @@ int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap) 
 * including the source filename and line number more conveniently than this

 * function.

 */

void __android_log_assert(const char* cond, const char* tag, const char* fmt,

                          ...)

#if defined(__GNUC__)

    __attribute__((__noreturn__))

    __attribute__((__format__(printf, 3, 4)))

#endif

    ;

void __android_log_assert(const char* cond, const char* tag, const char* fmt, ...)

    __attribute__((__noreturn__)) __attribute__((__format__(printf, 3, 4)));



#ifndef log_id_t_defined

#define log_id_t_defined
@@ -171,8 +160,7 @@ typedef enum log_id { 
 *

 * Apps should use __android_log_write() instead.

 */

int __android_log_buf_write(int bufID, int prio, const char* tag,

                            const char* text);

int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);



/**

 * Writes a formatted string to log buffer `id`,
@@ -182,12 +170,8 @@ int __android_log_buf_write(int bufID, int prio, const char* tag, 
 *

 * Apps should use __android_log_print() instead.

 */

int __android_log_buf_print(int bufID, int prio, const char* tag,

                            const char* fmt, ...)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 4, 5)))

#endif

    ;

int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)

    __attribute__((__format__(printf, 4, 5)));



#ifdef __cplusplus

}

liblog/include/log/log_id.h

+2 −6
Original line number Diff line number Diff line
@@ -45,12 +45,8 @@ typedef enum log_id { 
 */

int __android_log_buf_write(int bufID, int prio, const char* tag,

                            const char* text);

int __android_log_buf_print(int bufID, int prio, const char* tag,

                            const char* fmt, ...)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 4, 5)))

#endif

    ;

int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)

    __attribute__((__format__(printf, 4, 5)));



/*

 * log_id_t helpers