From e2c51809f70387a6ceddc89966b48aaee17ac402 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Mon, 17 Jul 2017 16:25:59 -0700 Subject: [PATCH] Add sys/cdefs.h to log/log_main.h. for liblog.vendor. __ANDROID_API__ is __ANDROID_API_FUTURE__ with BOARD_VNDK_VERSION=current, so we need it defined. Bug: 33241851 Test: BOARD_VNDK_VERSION=current m libgui.vendor (that uses liblog.vendor) Change-Id: I340ec048094c027828f516d891250651e0c88eea Merged-In: I340ec048094c027828f516d891250651e0c88eea --- liblog/include/log/log_main.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h index 5a3f04ca8..339a06d86 100644 --- a/liblog/include/log/log_main.h +++ b/liblog/include/log/log_main.h @@ -18,10 +18,9 @@ #define _LIBS_LOG_LOG_MAIN_H #include +#include -#ifdef __cplusplus -extern "C" { -#endif +__BEGIN_DECLS /* * Normally we strip the effects of ALOGV (VERBOSE messages), @@ -385,8 +384,6 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, #pragma clang diagnostic pop #endif -#ifdef __cplusplus -} -#endif +__END_DECLS #endif /* _LIBS_LOG_LOG_MAIN_H */