summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2017-07-17 16:25:59 -0700
committerYifan Hong <elsk@google.com>2017-07-17 17:59:35 -0700
commit79b1a3027b4c1b5f86a68c7a5bf1f1d2e22494d8 (patch)
tree76ddd7ce987180049877ea4dd628dc4dbd14e041 /liblog
parentbbd8b8b53463f955c50a6ec4c3779db3e0de4d5f (diff)
downloadsystem_core-79b1a3027b4c1b5f86a68c7a5bf1f1d2e22494d8.tar.gz
system_core-79b1a3027b4c1b5f86a68c7a5bf1f1d2e22494d8.tar.bz2
system_core-79b1a3027b4c1b5f86a68c7a5bf1f1d2e22494d8.zip
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
Diffstat (limited to 'liblog')
-rw-r--r--liblog/include/log/log_main.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/liblog/include/log/log_main.h b/liblog/include/log/log_main.h
index da1615828..68c2e9af6 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 <android/log.h>
+#include <sys/cdefs.h>
-#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 */