From 02aab08833371fe23e8b4fe79c1b1dd72d8d1639 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 22 Feb 2016 16:25:40 +0000
Subject: devel/android-tools-{adb,fastboot}-devel: update to m.p.6425

Changes:	https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/fastboot
---
 devel/android-tools-adb-devel/files/patch-adb_sysdeps.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(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
index 7480e1799b35..8ca18724c86a 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h
+++ b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h
@@ -1,5 +1,21 @@
 --- adb/sysdeps.h.orig	2015-09-05 00:01:27 UTC
 +++ adb/sysdeps.h
+@@ -61,11 +61,13 @@
+ #endif
+ #endif
+ 
+-#ifdef _WIN32
+-
++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
+ // Clang-only nullability specifiers
+ #define _Nonnull
+ #define _Nullable
++#endif
++
++#ifdef _WIN32
+ 
+ #include <ctype.h>
+ #include <direct.h>
 @@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
  
  #include <string>
-- 
cgit v1.2.3