diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-02-22 16:25:40 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-02-22 16:25:40 +0000 |
| commit | 02aab08833371fe23e8b4fe79c1b1dd72d8d1639 (patch) | |
| tree | ce2a8d47240d38cb821ba749b4f836375acc200f /devel/android-tools-adb-devel/files/patch-adb_sysdeps.h | |
| parent | - Update to 1.7.4 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=409356
Diffstat (limited to 'devel/android-tools-adb-devel/files/patch-adb_sysdeps.h')
| -rw-r--r-- | devel/android-tools-adb-devel/files/patch-adb_sysdeps.h | 16 |
1 files changed, 16 insertions, 0 deletions
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> |