From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH] bus/dpaa: fix build Date: Wed, 20 Jun 2018 16:09:30 +0200 Message-ID: <20180620140930.31002-1-thomas@monjalon.net> Cc: stable@dpdk.org, geoff.thorpe@nxp.com, hemant.agrawal@nxp.com, shreyansh.jain@nxp.com To: dev@dpdk.org Return-path: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Cc: geoff.thorpe@nxp.com Cc: hemant.agrawal@nxp.com Cc: shreyansh.jain@nxp.com Signed-off-by: Thomas Monjalon --- 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 e4b570214..92241d231 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.17.1