Merge "liblog: remove checks for __GNUC__" (5f8790f8) · Commits · e / os / android_system_core

liblog/include/android/log.h

+7 −23

Original line number	Original line	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).		* [printf(3)](http://man7.org/linux/man-pages/man3/printf.3.html).
	*/		*/
	int __android_log_print(int prio, const char* tag, const char* fmt, ...)		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
	;

	/**		/**
	* Equivalent to `__android_log_print`, but taking a `va_list`.		* Equivalent to `__android_log_print`, but taking a `va_list`.
	* (If `__android_log_print` is like `printf`, this is like `vprintf`.)		* (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)		int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap)
	#if defined(__GNUC__)		__attribute__((__format__(printf, 3, 0)));
	__attribute__((__format__(printf, 3, 0)))
	#endif
	;

	/**		/**
	* Writes an assertion failure to the log (as `ANDROID_LOG_FATAL`) and to		* 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		* including the source filename and line number more conveniently than this
	* function.		* function.
	*/		*/
	void __android_log_assert(const char* cond, const char* tag, const char* fmt,		void __android_log_assert(const char* cond, const char* tag, const char* fmt, ...)
	...)		__attribute__((__noreturn__)) __attribute__((__format__(printf, 3, 4)));
	#if defined(__GNUC__)
	__attribute__((__noreturn__))
	__attribute__((__format__(printf, 3, 4)))
	#endif
	;

	#ifndef log_id_t_defined		#ifndef log_id_t_defined
	#define log_id_t_defined		#define log_id_t_defined
	@@ -171,8 +160,7 @@ typedef enum log_id {
	*		*
	* Apps should use __android_log_write() instead.		* Apps should use __android_log_write() instead.
	*/		*/
	int __android_log_buf_write(int bufID, int prio, const char* tag,		int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);
	const char* text);

	/**		/**
	* Writes a formatted string to log buffer `id`,		* 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.		* Apps should use __android_log_print() instead.
	*/		*/
	int __android_log_buf_print(int bufID, int prio, const char* tag,		int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)
	const char* fmt, ...)		__attribute__((__format__(printf, 4, 5)));
	#if defined(__GNUC__)
	__attribute__((__format__(printf, 4, 5)))
	#endif
	;

	#ifdef __cplusplus		#ifdef __cplusplus
	}		}

liblog/include/log/log_id.h

+2 −6

Original line number	Original line	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,		int __android_log_buf_write(int bufID, int prio, const char* tag,
	const char* text);		const char* text);
	int __android_log_buf_print(int bufID, int prio, const char* tag,		int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)
	const char* fmt, ...)		__attribute__((__format__(printf, 4, 5)));
	#if defined(__GNUC__)
	__attribute__((__format__(printf, 4, 5)))
	#endif
	;

	/*		/*
	* log_id_t helpers		* log_id_t helpers