ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3421d3a6c5b73a8f0ed32fb8bad8363193e32aec
This commit is contained in:
Jim Pollock 2021-03-05 15:44:54 +00:00 • committed by Automerger Merge Worker
commit 7776fd25e1
2 changed files with 4 additions and 1 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,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
}

3
libcutils/threads.cpp
View file

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