From patchwork Wed Jun 20 14:09:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 41314 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ACE621B446; Wed, 20 Jun 2018 16:09:37 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id ED6AA1B533; Wed, 20 Jun 2018 16:09:35 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id DFA8421A99; Wed, 20 Jun 2018 10:09:34 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 20 Jun 2018 10:09:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=mesmtp; bh=XhqhA6tcrHM+EHX32FTaosjew+rWWINfQZ/kFQ +2wF4=; b=rG0/EDh75CK6P97+QkLpvFSShtoEy6nW2b4R9eRvC4xnNmgjghTNCG t5N4MUfda4Tq0yg9U9HTQYAqL88Ys0HdD2R5OhpnXzAxrAtMb8eY2AKv8MIuaTEx qIF6sx8GE3FZCbilbMSmfM7DlFIzUmw66XiMuT11iWdbJrUms4QxY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=XhqhA6tcrHM+EHX32 FTaosjew+rWWINfQZ/kFQ+2wF4=; b=GyrnonXalZfUoCnl8dL3t0zEi9Uatdi/Z CJjycZhy/HizfLbM0yUdvmzJSGZkJII5iUcNfjoNwVkMMiXVQwy3gRO3cgFRWECY 0dSTPeI1cHn4/BLCI4LJpFtCshbq4P+iEukLxt1jVs2IjgyvBTDtPFj1xTmhuCK0 tq2SpyiCmYlh72HeTSOAotIsyrFmJb/XQddXLoZJbnu+dxaS0oWY39KAcrVu/AxP p0ceWWw+GMlC+NdAFSUMCNql7cBdK2yDsd1qsz/8lmpJH4iz4DsgmIqAy3OugE7k oIwC5v6VjtkULpaeDNpruykA7OAdJ87ntt5/k+VUjab0sS4AMGxnQ== X-ME-Proxy: X-ME-Sender: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id D9D0AE4AB9; Wed, 20 Jun 2018 10:09:33 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: stable@dpdk.org, geoff.thorpe@nxp.com, hemant.agrawal@nxp.com, shreyansh.jain@nxp.com Date: Wed, 20 Jun 2018 16:09:30 +0200 Message-Id: <20180620140930.31002-1-thomas@monjalon.net> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] bus/dpaa: fix build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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 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 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