commit 16f5baf580fe99255ace9487f078530cf513728e
author Ben Murdoch <benm@google.com> Fri Dec 12 11:32:42 2014 +0000
committer George Mount <mount@google.com> Fri Dec 12 07:06:12 2014 -0800
tree 5a009ffac89ce08d120eefc7a6bf821f0769485b
parent b8a8cc1952d61a2f3a2568848933943a543b5d3e

Fix broken build on Mac.

Bug 18720980

Change-Id: I26d72cfb1af9cc38ec8415a84ace367501ce021d

src/base/platform/platform-posix.cc

diff --git a/src/base/platform/platform-posix.cc b/src/base/platform/platform-posix.cc
index 0fc04fc..99feb65 100644
--- a/src/base/platform/platform-posix.cc
+++ b/src/base/platform/platform-posix.cc
@@ -254,7 +254,13 @@
 
 int OS::GetCurrentThreadId() {
 #if defined(ANDROID)
+#if defined(__APPLE__)
+  uint64_t owner;
+  pthread_threadid_np(NULL, &owner);  // Requires Mac OS 10.6
+  return owner;
+#else
   return static_cast<int>(syscall(__NR_gettid));
+#endif
 #elif defined(SYS_gettid)
   return static_cast<int>(syscall(SYS_gettid));
 #else