tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "threads.h: avoid defining gettid on glibc >= 2.30" into main am: 8dad4b2b8a am: b91d39f83d am: 3aebf3f499

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

Change-Id: I2cfcef5687fc88b25d5d9438167e016438f4f58b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hao Chen 2023-07-19 00:06:39 +00:00 committed by Automerger Merge Worker
commit a60bfe1898
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcutils/include/cutils/threads.h
View file

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

4
libcutils/threads.cpp
View file

@ -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__)