diff options
| author | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
|---|---|---|
| committer | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
| commit | 873c687c09e0a1a78a8f3601d31330ad1897e484 (patch) | |
| tree | ff2fa2e2d27b55c002a6d46d50aab2c66e0bf21a /src/utils/threadpool.cc | |
| parent | 395b1f6877fbc2666383f3428f17400c35aa52a4 (diff) | |
| parent | b9ae809f200982119d16ec9613f3db95eca923b9 (diff) | |
| download | libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.gz libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.bz2 libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.zip | |
Merge branch 'master' into 'scrub-obsolete'
# Conflicts:
# debian/changelog
Diffstat (limited to 'src/utils/threadpool.cc')
| -rw-r--r-- | src/utils/threadpool.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/threadpool.cc b/src/utils/threadpool.cc index a3099e1..6fa2e88 100644 --- a/src/utils/threadpool.cc +++ b/src/utils/threadpool.cc @@ -29,6 +29,7 @@ #include <cinttypes> #include <cstddef> #include <cstdint> +#include <cstdio> #include <cstring> #include <new> #include <utility> @@ -216,7 +217,7 @@ void ThreadPool::WorkerThread::SetupName() { rv = pthread_setname_np(name); assert(rv == 0); static_cast<void>(rv); -#elif defined(__ANDROID__) || defined(__GLIBC__) +#elif defined(__ANDROID__) || (defined(__GLIBC__) && !defined(__GNU__)) // If the |name| buffer is longer than 16 bytes, pthread_setname_np fails // with error 34 (ERANGE) on Android. char name[16]; |