Merge "Suppress gnu-zero-variadic-macro-arguments warning." (a7ba467f) · Commits · e / os / android_system_core

liblog/include/log/log_main.h

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -40,19 +40,6 @@ __BEGIN_DECLS
	#endif		#endif
	#endif		#endif

	/*
	* Use __VA_ARGS__ if running a static analyzer,
	* to avoid warnings of unused variables in __VA_ARGS__.
	* __FAKE_USE_VA_ARGS is undefined at link time,
	* so don't link with __clang_analyzer__ defined.
	*/
	#ifdef __clang_analyzer__
	extern void __fake_use_va_args(int, ...);
	#define __FAKE_USE_VA_ARGS(...) __fake_use_va_args(0, ##__VA_ARGS__)
	#else
	#define __FAKE_USE_VA_ARGS(...) ((void)(0))
	#endif

	/* --------------------------------------------------------------------- */		/* --------------------------------------------------------------------- */

	/*		/*
	@@ -66,6 +53,19 @@ extern void __fake_use_va_args(int, ...);
	#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"		#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
	#endif		#endif

			/*
			* Use __VA_ARGS__ if running a static analyzer,
			* to avoid warnings of unused variables in __VA_ARGS__.
			* __FAKE_USE_VA_ARGS is undefined at link time,
			* so don't link with __clang_analyzer__ defined.
			*/
			#ifdef __clang_analyzer__
			extern void __fake_use_va_args(int, ...);
			#define __FAKE_USE_VA_ARGS(...) __fake_use_va_args(0, ##__VA_ARGS__)
			#else
			#define __FAKE_USE_VA_ARGS(...) ((void)(0))
			#endif

	#ifndef __predict_false		#ifndef __predict_false
	#define __predict_false(exp) __builtin_expect((exp) != 0, 0)		#define __predict_false(exp) __builtin_expect((exp) != 0, 0)
	#endif		#endif