summaryrefslogtreecommitdiff
path: root/devel/android-tools-adb-devel/files/patch-base_logging.cpp
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-12-16 09:36:24 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-12-16 09:36:24 +0000
commitf2442363ed5ccdffa640c61ec211541516c605ed (patch)
tree05cedf37cad423e26e50e56db0ffe88529d18e47 /devel/android-tools-adb-devel/files/patch-base_logging.cpp
parent- Update to version 5.4.0 (diff)
devel/android-tools-*: drop FreeBSD 8.x support
Notes
Notes: svn path=/head/; revision=403850
Diffstat (limited to 'devel/android-tools-adb-devel/files/patch-base_logging.cpp')
-rw-r--r--devel/android-tools-adb-devel/files/patch-base_logging.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/devel/android-tools-adb-devel/files/patch-base_logging.cpp b/devel/android-tools-adb-devel/files/patch-base_logging.cpp
index 7ace8ede711e..a59e7eef0ae0 100644
--- a/devel/android-tools-adb-devel/files/patch-base_logging.cpp
+++ b/devel/android-tools-adb-devel/files/patch-base_logging.cpp
@@ -1,14 +1,12 @@
--- base/logging.cpp.orig 2015-12-14 21:12:52 UTC
+++ base/logging.cpp
-@@ -66,6 +68,16 @@
+@@ -66,6 +68,14 @@
#include <unistd.h>
#elif defined(_WIN32)
#include <windows.h>
+#elif defined(__DragonFly__)
+#include <unistd.h>
+#elif defined(__FreeBSD__)
-+#include <sys/param.h>
-+#include <sys/thr.h>
+#include <pthread_np.h>
+#elif defined(__NetBSD__)
+#include <lwp.h>
@@ -17,7 +15,7 @@
#endif
static pid_t GetThreadId() {
-@@ -77,6 +89,20 @@ static pid_t GetThreadId() {
+@@ -77,6 +89,14 @@ static pid_t GetThreadId() {
return syscall(__NR_gettid);
#elif defined(_WIN32)
return GetCurrentThreadId();
@@ -26,13 +24,7 @@
+#elif defined(__NetBSD__)
+ return _lwp_self();
+#elif defined(__FreeBSD__)
-+# if __FreeBSD_version > 900030
-+ return pthread_getthreadid_np();
-+# else
-+ long lwpid;
-+ thr_self(&lwpid);
-+ return lwpid;
-+# endif
++ return pthread_getthreadid_np();
+#else
+ return (intptr_t) pthread_self();
#endif