Merge pull request #4 from novski/b2g-fp2

Bug 1294725 - Fairphone 2 needs special caf repo revision=gerard-majax
mozilla-b2g · Sep 8, 2016 · 3632acf · 3632acf
2 parents 66548a1 + cc593dc
commit 3632acf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/include/binder/Binder.h b/include/binder/Binder.h
@@ -17,7 +17,13 @@
 #ifndef ANDROID_BINDER_H
 #define ANDROID_BINDER_H
 
+#if __cplusplus >= 201103L
+#include <atomic>
+typedef std::atomic<uintptr_t> atomic_uintptr_t;
+#else
 #include <stdatomic.h>
+#endif
+
 #include <stdint.h>
 #include <binder/IBinder.h>