From ce819b84220ef4abe87cccc71c78e7f4bc7a2f8b Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Wed, 20 Jun 2018 12:38:06 +0200 Subject: [PATCH] bus/dpaa: fix build The DPAA bus driver is defining some macros without prefix. So it can conflict with other libraries like libbsd: drivers/bus/dpaa/include/compat.h:53: error: "__packed" redefined /usr/include/bsd/sys/cdefs.h:120: note: this is the location of the previous definition Fixes: 39f373cf015a ("bus/dpaa: add compatibility and helper macros") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Shreyansh Jain --- drivers/bus/dpaa/include/compat.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h index e4b5702148..92241d2314 100644 --- a/drivers/bus/dpaa/include/compat.h +++ b/drivers/bus/dpaa/include/compat.h @@ -48,9 +48,15 @@ */ /* Required compiler attributes */ +#ifndef __maybe_unused #define __maybe_unused __rte_unused +#endif +#ifndef __always_unused #define __always_unused __rte_unused +#endif +#ifndef __packed #define __packed __rte_packed +#endif #define noinline __attribute__((noinline)) #define L1_CACHE_BYTES 64 -- 2.20.1