From 69c62f5f3cc424b7dd0c8e4097743b39a9c48306 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Jul 2019 08:48:13 -0700 Subject: [lttng-tools][PATCH] check for gettid API during configure Add support for gettid() provided by glibc 2.30+ Since version 2.30 glibc provides gettid and it causes conflicts with locally defined gettid(). Use the local definition of gettid only if system gettid is not available. https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD Upstream-Status: Pending Signed-off-by: Khem Raj --- configure.ac | 2 +- src/common/compat/tid.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7b99f5c..e4bd82c 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,7 @@ AC_CHECK_HEADERS([ \ # Basic functions check AC_CHECK_FUNCS([ \ atexit bzero clock_gettime dup2 fdatasync fls ftruncate \ - gethostbyname gethostname getpagesize localtime_r memchr memset \ + gethostbyname gethostname getpagesize gettid localtime_r memchr memset \ mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \ strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \ diff --git a/src/common/compat/tid.h b/src/common/compat/tid.h index 40f562f..aa07a85 100644 --- a/src/common/compat/tid.h +++ b/src/common/compat/tid.h @@ -25,6 +25,7 @@ #ifndef LTTNG_TID_H #define LTTNG_TID_H +#if !HAVE_GETTID #ifdef __linux__ #include #endif @@ -47,5 +48,5 @@ static inline pid_t gettid(void) return getpid(); } #endif - +#endif /* HAVE_GETTID */ #endif /* LTTNG_TID_H */ -- 2.22.0