diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-09 22:08:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-09 22:08:27 +0000 |
| commit | f7bda1df43b7a0c583cb063968bc5a5515fbc6ce (patch) | |
| tree | 8e88cbeecbbce09bb3a47acc2c7a4fe568d2e07b | |
| parent | 7d59dad4d66ebd5ae24960e0353ecdbf30f8cfcd (diff) | |
| parent | c0ae3c5af9e1e613a20fb3f0a6a2c1fc812fbefd (diff) | |
| download | wpa_supplicant_8-f7bda1df43b7a0c583cb063968bc5a5515fbc6ce.tar.gz | |
Merge "[VirtIO WiFi] Add definition guard for ARRAY_SIZE" into emu-master-devaosp-emu-30-release
| -rw-r--r-- | src/utils/common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/utils/common.h b/src/utils/common.h index 792a30ab..9cd23939 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -548,8 +548,9 @@ void int_array_concat(int **res, const int *a); void int_array_sort_unique(int *a); void int_array_add_unique(int **res, int a); +#ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) - +#endif void str_clear_free(char *str); void bin_clear_free(void *bin, size_t len); |