diff options
| author | Maureen Helm <maureen.helm@nxp.com> | 2016-07-21 16:03:19 -0500 |
|---|---|---|
| committer | Maureen Helm <maureen.helm@nxp.com> | 2016-07-22 15:47:58 +0000 |
| commit | bfb451e5ebd3367bc0dc9213a350b202196c8c6b (patch) | |
| tree | c75be4d9e8b4cc6ebc9558eb8d750591626039c1 /ext | |
| parent | d2549115ca922ea897079b9d98913f3079deb8c1 (diff) | |
ksdk: Fix ARRAY_SIZE conflict
Wrap the ksdk's ARRAY_SIZE macro definition with an ifndef to avoid
conflicting with the same macro in include/misc/util.h.
Change-Id: I102170519857ba6c593c3d3ee96e3394711c625d
Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/hal/ksdk/drivers/fsl_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/hal/ksdk/drivers/fsl_common.h b/ext/hal/ksdk/drivers/fsl_common.h index 105dca049..68806f096 100644 --- a/ext/hal/ksdk/drivers/fsl_common.h +++ b/ext/hal/ksdk/drivers/fsl_common.h @@ -138,7 +138,9 @@ typedef int32_t status_t; /* @} */ /*! @brief Computes the number of elements in an array. */ +#if !defined(ARRAY_SIZE) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif /*! @name UINT16_MAX/UINT32_MAX value */ /* @{ */ |