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

Commit 253445ce authored by Hao Chen's avatar Hao Chen
Browse files

threads.h: avoid defining gettid on glibc >= 2.30 

The issue in https://bugs.chromium.org/p/chromium/issues/detail?id=1182060 also
exists on glibc 2.30 and 2.31 since `gettid` was Introduced in glibc 2.30.

See https://man7.org/linux/man-pages/man2/gettid.2.html

Bug: 285204695
Test: Build
Change-Id: I7e534edf8c0a20c415232bcfffabbf2c1d6eec98
parent 38b572c9

libcutils/include/cutils/threads.h

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

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

//

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

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

extern pid_t gettid();

#endif

libcutils/threads.cpp

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

#endif



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

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

// 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.

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

#else

pid_t gettid() {

#if defined(__APPLE__)