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

Commit 489eafa3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove gettid declaration from cutils" into main am: 5d0aeaaf am: 4f921a22 

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



Change-Id: I3ce3973c3543a2729bee584154738ed53ddca2e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 83f45af8 4f921a22

libcutils/include/cutils/threads.h

+0 −15
Original line number Diff line number Diff line
@@ -23,18 +23,3 @@ 
#else

#include <pthread.h>

#endif
 


#ifdef __cplusplus

extern "C" {

#endif



//

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

//

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

extern pid_t gettid();

#endif



#ifdef __cplusplus

}

#endif

libcutils/threads.cpp

+4 −2
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
** limitations under the License.

*/



#include <cutils/threads.h>

#include <sys/types.h>



#if defined(__APPLE__)

#include <pthread.h>

#include <stdint.h>

#elif defined(__linux__)

#include <pthread.h>

#include <syscall.h>

#include <unistd.h>

#elif defined(_WIN32)
@@ -29,7 +31,7 @@ 
// No definition needed for Android because we'll just pick up bionic's copy.

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

#else

pid_t gettid() {

extern "C" pid_t gettid() {

#if defined(__APPLE__)

  uint64_t tid;

  pthread_threadid_np(NULL, &tid);