Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad43e0db authored by Christopher N. Hesse's avatar Christopher N. Hesse Committed by android-build-merger
Browse files

Merge "libcutils: Fix thread ID on macOS" am: 6958506e 

am: bdee15ef

Change-Id: Iac6a73e1b7dfb387cd53798824575ca29b24ee04
parents c9a6da94 bdee15ef

base/logging.cpp

+3 −1
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ static thread_id GetThreadId() { 
#if defined(__BIONIC__)

  return gettid();

#elif defined(__APPLE__)

  return syscall(SYS_thread_selfid);

  uint64_t tid;

  pthread_threadid_np(NULL, &tid);

  return tid;

#elif defined(__linux__)

  return syscall(__NR_gettid);

#elif defined(_WIN32)

libcutils/threads.c

+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ 
#ifndef __ANDROID__

pid_t gettid() {

#if defined(__APPLE__)

  return syscall(SYS_thread_selfid);

  uint64_t tid;

  pthread_threadid_np(NULL, &tid);

  return tid;

#elif defined(__linux__)

  return syscall(__NR_gettid);

#elif defined(_WIN32)