[gentoo-commits] proj/musl:master commit in: dev-util/android-tools/files/

[gentoo-commits] proj/musl:master commit in: dev-util/android-tools/files/

[Aric Belsito]

commit:     d5b46cff84ac72a3d067835d2e79bead32659c51
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 19:46:13 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan 29 19:46:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d5b46cff

dev-util/android-tools: add build patch

 .../files/android-tools-8.1.0_p1-build.patch       | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
new file mode 100644
index 0000000..f3d664e
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
@@ -0,0 +1,30 @@
+--- a/adb/sysdeps.h
++++ b/adb/sysdeps.h
+@@ -66,6 +66,11 @@
+ #endif
+ #endif
+ 
++#ifndef __clang__
++#define _Nonnull
++#define _Nullable
++#endif
++
+ #ifdef _WIN32
+ 
+ // Clang-only nullability specifiers
+--- a/libcutils/include/cutils/trace.h
++++ b/libcutils/include/cutils/trace.h
+@@ -18,7 +18,13 @@
+ #define _LIBS_CUTILS_TRACE_H
+ 
+ #include <inttypes.h>
++// https://gcc.gnu.org/PR60932
++#ifdef __cplusplus
++#include <atomic>
++using namespace std;
++#else
+ #include <stdatomic.h>
++#endif
+ #include <stdbool.h>
+ #include <stdint.h>
+ #include <stdio.h>