Mesa (staging/19.1): util: Drop preprocessor guards for glibc-2.12

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 2fd001f21ea8539365ef00bc16853676c0bef352
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fd001f21ea8539365ef00bc16853676c0bef352

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jul 24 18:26:49 2019 -0700

util: Drop preprocessor guards for glibc-2.12

glibc-2.12 was released in 2010. No one is building new Mesa against 9
year old glibc, and removing these checks allows the code to work on
other C libraries like musl.

Acked-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 9c411e020d164563fb6fcd92a28a435277bf0745)

---

 src/util/u_thread.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/util/u_thread.h b/src/util/u_thread.h
index a46c18d3db2..8c8cc803199 100644
--- a/src/util/u_thread.h
+++ b/src/util/u_thread.h
@@ -61,11 +61,7 @@ static inline thrd_t u_thread_create(int (*routine)(void *), void *param)
 static inline void u_thread_setname( const char *name )
 {
 #if defined(HAVE_PTHREAD)
-#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
-      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
-      defined(__linux__)
    pthread_setname_np(pthread_self(), name);
-#  endif
 #endif
    (void)name;
 }
@@ -150,10 +146,7 @@ u_thread_get_time_nano(thrd_t thread)
 static inline bool u_thread_is_self(thrd_t thread)
 {
 #if defined(HAVE_PTHREAD)
-#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
-      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
    return pthread_equal(pthread_self(), thread);
-#  endif
 #endif
    return false;
 }