From f3f1547a3d9867948124e453d430260bea72b856 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 5 Sep 2015 22:49:27 +0000 Subject: devel/android-tools-{adb,fastboot}-devel: update to m.p.1112 files/usb_libusb.cpp chases the following commits: https://android.googlesource.com/platform/system/core/+/49ee7cf%5E!/#F6 https://android.googlesource.com/platform/system/core/+/7a3f8d6%5E!/ Changes: https://android.googlesource.com/platform/system/core/+log/94a845d..e4c1bb5/adb Changes: https://android.googlesource.com/platform/system/core/+log/94a845d..e4c1bb5/fastboot --- .../files/patch-adb_sysdeps.h | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 devel/android-tools-adb-devel/files/patch-adb_sysdeps.h (limited to 'devel/android-tools-adb-devel/files/patch-adb_sysdeps.h') diff --git a/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h new file mode 100644 index 000000000000..7480e1799b35 --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h @@ -0,0 +1,27 @@ +--- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC ++++ adb/sysdeps.h +@@ -401,6 +401,11 @@ typedef std::unique_ptr + ++#if defined(__Bitrig__) || defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || defined(__OpenBSD__) ++#include ++#endif ++ + #define OS_PATH_SEPARATORS "/" + #define OS_PATH_SEPARATOR '/' + #define OS_PATH_SEPARATOR_STR "/" +@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create + static __inline__ int adb_thread_setname(const std::string& name) { + #ifdef __APPLE__ + return pthread_setname_np(name.c_str()); ++#elif defined(__Bitrig__) || defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || defined(__OpenBSD__) ++ pthread_set_name_np(pthread_self(), name.c_str()); ++ return 0; ++#elif defined(__NetBSD__) ++ return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str()); + #else + const char *s = name.c_str(); + -- cgit v1.2.3