[dpdk-dev] [PATCH] net/bnx2x: fix the meson compile issue

[Gavin Hu]

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 at dpdk.org

Signed-off-by: Gavin Hu <gavin.hu at arm.com>
---
 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