diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2015-12-16 01:55:44 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2015-12-16 01:55:44 +0000 |
commit | 7cdb29d2e265e0ce1e1308782e7d4378878e02ae (patch) | |
tree | 96baa4ff4679f9c03c2b5e4969ce4ef9787940c8 /devel/android-tools-adb-devel/files/patch-base_logging.cpp | |
parent | - Update to 1.6.1.3 (diff) |
devel/android-tools-{adb,fastboot}-devel: update to m.p.5956
Changes: https://android.googlesource.com/platform/system/core/+log/0bb1ce06ea46..461a29540c01/adb
Changes: https://android.googlesource.com/platform/system/core/+log/0bb1ce06ea46..461a29540c01/fastboot
Notes
Notes:
svn path=/head/; revision=403829
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.cpp | 40 |
1 files changed, 40 insertions, 0 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 new file mode 100644 index 000000000000..7ace8ede711e --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-base_logging.cpp @@ -0,0 +1,40 @@ +--- base/logging.cpp.orig 2015-12-14 21:12:52 UTC ++++ base/logging.cpp +@@ -66,6 +68,16 @@ + #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> ++#else ++#include <stdint.h> + #endif + + static pid_t GetThreadId() { +@@ -77,6 +89,20 @@ static pid_t GetThreadId() { + return syscall(__NR_gettid); + #elif defined(_WIN32) + return GetCurrentThreadId(); ++#elif defined(__DragonFly__) ++ return lwp_gettid(); ++#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 ++#else ++ return (intptr_t) pthread_self(); + #endif + } + |