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

Commit 7776fd25 authored by Jim Pollock's avatar Jim Pollock Committed by Automerger Merge Worker
Browse files

Merge "threads.h: avoid defining gettid on glibc >= 2.32" am: fdac598f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1612939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3421d3a6c5b73a8f0ed32fb8bad8363193e32aec
parents f998808b fdac598f

libcutils/include/cutils/threads.h

+2 −0
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ extern "C" { 
//

// Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.

//

#if !defined(__GLIBC__) || __GLIBC__ >= 2 && __GLIBC_MINOR__ < 32

extern pid_t gettid();

#endif



#ifdef __cplusplus

}

libcutils/threads.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include <windows.h>

#endif



#if defined(__BIONIC__)

#if defined(__BIONIC__) || defined(__GLIBC__) && __GLIBC_MINOR__ >= 32

// No definition needed for Android because we'll just pick up bionic's copy.

// No definition needed for Glibc >= 2.32 because it exposes its own copy.

#else

pid_t gettid() {

#if defined(__APPLE__)