Merge "Fix static_assert compile issue"

am: 9845354ef7 Change-Id: Ie3b44c59244222cc63cdc72cf0f54f4b78466df8
2017-04-20 07:59:46 +00:00 · 2017-04-20 07:59:46 +00:00 · 6b3c4365b6
commit 6b3c4365b6
parent c985524d71 9845354ef7
1 changed files with 10 additions and 0 deletions
--- a/include/hardware_legacy/gscan.h
+++ b/include/hardware_legacy/gscan.h
@ -3,6 +3,16 @@
 #ifndef __WIFI_HAL_GSCAN_H__
 #define __WIFI_HAL_GSCAN_H__

+// Define static_assert() unless already defined by compiler.
+#ifndef __has_feature
+    #define __has_feature(__x) 0
+#endif
+#if !(__has_feature(cxx_static_assert)) && !defined(static_assert)
+        #define static_assert(__b, __m) \
+                extern int compile_time_assert_failed[ ( __b ) ? 1 : -1 ]  \
+                                                                   __attribute__( ( unused ) );
+#endif
+
 /* AP Scans */

 typedef enum {