aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-08 14:17:17 +0100
committerMax Kellermann <max@duempel.org>2014-12-08 14:17:17 +0100
commitd8fc2db910a11dbbba53ba7ecf96d0e32a081076 (patch)
tree02964f56dc04887c968cf774c5307eabbc0009a8
parentdc11dea7cc204e25126c2c024744eded02eb1b08 (diff)
downloadmpd-d8fc2db910a11dbbba53ba7ecf96d0e32a081076.tar.gz
mpd-d8fc2db910a11dbbba53ba7ecf96d0e32a081076.tar.xz
mpd-d8fc2db910a11dbbba53ba7ecf96d0e32a081076.zip
thread/Id: drop "::" prefix before pthread function names
The "::" to explicitly refer to the global namespace appeared like a good idea in C++, but it breaks with C libraries that implement standard functions using macros (e.g. musl).
-rw-r--r--NEWS1
-rw-r--r--src/thread/Id.hxx4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 67a7b31a0..fa6bb2060 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
ver 0.18.20 (not yet released)
+* fix build failure with musl
ver 0.18.19 (2014/11/26)
* archive
diff --git a/src/thread/Id.hxx b/src/thread/Id.hxx
index fa1cf2cab..2372a12f5 100644
--- a/src/thread/Id.hxx
+++ b/src/thread/Id.hxx
@@ -75,7 +75,7 @@ public:
#ifdef WIN32
return ::GetCurrentThreadId();
#else
- return ::pthread_self();
+ return pthread_self();
#endif
}
@@ -84,7 +84,7 @@ public:
#ifdef WIN32
return id == other.id;
#else
- return ::pthread_equal(id, other.id);
+ return pthread_equal(id, other.id);
#endif
}