commit 9da687e2f49c2a67135bf30d074de445728e109d
author Mark Salyzyn <salyzyn@google.com> Tue Dec 08 13:42:41 2015 -0800
committer Mark Salyzyn <salyzyn@google.com> Tue Dec 08 13:42:41 2015 -0800
tree fcad0d0f8e72c806418d5975db8bcbd51837ead9
parent eaccfde0759c6df6011c2a1e69ca275f2e24d909

bionic: Build Breakage

Bug: 23668800
Change-Id: Ic7cf5864d3f5881e6f7105a49ecf62b1bc4a604c

libc/bionic/libc_logging.cpp

diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index 34867eb..67bb052 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -514,7 +514,7 @@
 // rare, we can accept a trylock failure gracefully.
 static pthread_mutex_t lock_clockid = PTHREAD_MUTEX_INITIALIZER;
 
-static clockid_t android_log_clockid()
+static clockid_t __android_log_clockid()
 {
   static struct cache r_time_cache = { NULL, static_cast<uint32_t>(-1), 0 };
   static struct cache p_time_cache = { NULL, static_cast<uint32_t>(-1), 0 };
@@ -563,7 +563,7 @@
   vec[1].iov_base = &tid;
   vec[1].iov_len = sizeof(tid);
   timespec ts;
-  clock_gettime(android_log_clockid(), &ts);
+  clock_gettime(__android_log_clockid(), &ts);
   log_time realtime_ts;
   realtime_ts.tv_sec = ts.tv_sec;
   realtime_ts.tv_nsec = ts.tv_nsec;
@@ -606,7 +606,7 @@
   vec[1].iov_base = &tid;
   vec[1].iov_len = sizeof(tid);
   timespec ts;
-  clock_gettime(android_log_clockid(), &ts);
+  clock_gettime(__android_log_clockid(), &ts);
   log_time realtime_ts;
   realtime_ts.tv_sec = ts.tv_sec;
   realtime_ts.tv_nsec = ts.tv_nsec;