diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-17 15:43:18 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-17 16:04:37 +0300 |
| commit | 61d9232c0245af1030213c4ea608318b13ca3118 (patch) | |
| tree | 5fd310979a844e89053f8e2dc9b026f986d8a92f /src | |
| parent | 5254127e8c9d2f9dbfb19c2245717c3461107c50 (diff) | |
| download | qtlocation-mapboxgl-61d9232c0245af1030213c4ea608318b13ca3118.tar.gz | |
[core] Do not use pthread_getname_np before glibc 2.11
Follows approach in src/mbgl/util/thread.hpp header.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/platform/log.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mbgl/platform/log.cpp b/src/mbgl/platform/log.cpp index 4b56435df0..648c3bd18c 100644 --- a/src/mbgl/platform/log.cpp +++ b/src/mbgl/platform/log.cpp @@ -49,11 +49,17 @@ void Log::record(EventSeverity severity, Event event, int64_t code, const std::s std::stringstream logStream; - #if !defined(__ANDROID__) && (defined( __APPLE__) || defined(__linux__)) +#if defined(__APPLE__) char name[32]; pthread_getname_np(pthread_self(), name, sizeof(name)); logStream << "{" << name << "}"; - #endif +#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ) +#if __GLIBC_PREREQ(2, 12) + char name[32]; + pthread_getname_np(pthread_self(), name, sizeof(name)); + logStream << "{" << name << "}"; +#endif +#endif logStream << "[" << Enum<Event>::toString(event) << "]"; |