From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B95AA00C2 for ; Tue, 29 Oct 2019 12:09:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0C4FD1BEC9; Tue, 29 Oct 2019 12:09:46 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id C74EA1BEC1; Tue, 29 Oct 2019 12:09:42 +0100 (CET) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1C5831F1; Tue, 29 Oct 2019 04:09:42 -0700 (PDT) Received: from net-arm-thunderx2-01.test.ast.arm.com (net-arm-thunderx2-01.shanghai.arm.com [10.169.40.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 81FA33F71E; Tue, 29 Oct 2019 04:09:40 -0700 (PDT) From: Gavin Hu To: dev@dpdk.org Cc: nd@arm.com, ajit.khaparde@broadcom.com, somnath.kotur@broadcom.com, stable@dpdk.org Date: Tue, 29 Oct 2019 19:09:24 +0800 Message-Id: <1572347364-23487-1-git-send-email-gavin.hu@arm.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH] net/bnx2x: fix the meson compile issue X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The definition is conflicting with that of the compiler, as show the following error: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error: conflicting types for ‘uint64_t’ #define __le64 uint64_t ^~~~ In file included from /usr/include/stdint.h:37, from /usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9, from ../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16, from ../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_rxtx.c:8: /usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous declaration of ‘uint64_t’ was here typedef __uint64_t uint64_t; The fix is to remove the duplicate definition. Fixes: 38dff79ba736 ("net/bnx2x: update HSI") Cc: stable@dpdk.org Signed-off-by: Gavin Hu --- drivers/net/bnx2x/bnx2x_osal.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h index 7cd2932..aad4e0b 100644 --- a/drivers/net/bnx2x/bnx2x_osal.h +++ b/drivers/net/bnx2x/bnx2x_osal.h @@ -22,8 +22,4 @@ #undef __LITTLE_ENDIAN #endif -#define __le16 uint16_t -#define __le32 uint32_t -#define __le64 uint64_t - #endif /* BNX2X_OSAL_H */ -- 2.7.4