Merge "Hide gnu extension warnings in log/log.h" am: 21049e5c91 am: 9eb3592e62

am: 4df8e4580b

Change-Id: I18d466cf45327b96856e2fb2c0ec7954a675987a
This commit is contained in:
Colin Cross 2016-09-22 09:15:06 +00:00 committed by android-build-merger
commit e84c07c832

View file

@ -41,6 +41,15 @@
extern "C" {
#endif
// This file uses ", ## __VA_ARGS__" zero-argument token pasting to
// work around issues with debug-only syntax errors in assertions
// that are missing format strings. See commit
// 19299904343daf191267564fe32e6cd5c165cd42
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
#endif
// ---------------------------------------------------------------------
/*
@ -692,6 +701,10 @@ int __android_log_buf_print(int bufID, int prio, const char *tag, const char *fm
#endif
;
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#ifdef __cplusplus
}
#endif