diff options
| author | Roshan Pius <rpius@google.com> | 2017-04-20 08:01:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-20 08:01:45 +0000 |
| commit | fa72bc1b483f9ac545b568961d9b257a421ade56 (patch) | |
| tree | ca71c3b73cb0de98dfd52dbcfc7b680ac042605c | |
| parent | 5465ba3b988024a892b525831e339523e9900f17 (diff) | |
| parent | 6b3c4365b692c610e47863e98c50c264dec7ad77 (diff) | |
| download | libhardware_legacy-fa72bc1b483f9ac545b568961d9b257a421ade56.tar.gz | |
Merge "Fix static_assert compile issue" am: 9845354ef7
am: 6b3c4365b6
Change-Id: Ic5414a92c32b24be94ed51465c9a344c070a0cd0
| -rw-r--r-- | include/hardware_legacy/gscan.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/hardware_legacy/gscan.h b/include/hardware_legacy/gscan.h index 372f2bd..d5d8b9c 100644 --- 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 { |