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

Commit a60bfe18 authored by Hao Chen's avatar Hao Chen Committed by Automerger Merge Worker
Browse files

Merge "threads.h: avoid defining gettid on glibc >= 2.30" into main am:... 

Merge "threads.h: avoid defining gettid on glibc >= 2.30" into main am: 8dad4b2b am: b91d39f8 am: 3aebf3f4

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



Change-Id: I2cfcef5687fc88b25d5d9438167e016438f4f58b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98c5abe6 3aebf3f4

libcutils/include/cutils/threads.h

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

//

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

// 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();

extern pid_t gettid();

#endif

#endif

libcutils/threads.cpp

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

#include <windows.h>

#endif

#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 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

#else

pid_t gettid() {

pid_t gettid() {

#if defined(__APPLE__)

#if defined(__APPLE__)