From patchwork Mon Mar 9 09:09:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sunil Kumar Kori X-Patchwork-Id: 66396 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 15BDBA052E; Mon, 9 Mar 2020 10:09:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 989721C020; Mon, 9 Mar 2020 10:09:49 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 302CD1BFF5; Mon, 9 Mar 2020 10:09:48 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02999fDb024776; Mon, 9 Mar 2020 02:09:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=pfpt0818; bh=kbuzWto31mhhHDAuVqq7E1eXGbMdwnX/v0VJr9vycB4=; b=ZuyB3ScYjHu1Ekyhxg6MvbXel4Ah0i1jYC6JZB8A8y60bU7JeN4Ly46S9sYOY7//5PrH QkGuNHUibWGusMSb6J4z9XjCeGsotwbyTFjWZoiQRauaUBL5SrwwKyGSG+ANF6uGmZb9 aQJMnOtc6afoFjI3wdwn+niJkCBOEpuhACggygK+GImYgBCAgLoVsywsXojNDpSL7/R6 WxngIe2ROBIO8raYot5js75yYqTmQuHREeZHoIAymZHFJCIqd+Z7r10H53XuJbol/NXM jm4HJhz4W+owPzPabbT+hQ3NV+jXTnRS3pI+Z4o84EIL1kKF8HeVU1lWUTb7zgjdCZn2 Kg== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2ymc0sp05a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 09 Mar 2020 02:09:47 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 9 Mar 2020 02:09:43 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 9 Mar 2020 02:09:44 -0700 Received: from localhost.localdomain (unknown [10.28.34.200]) by maili.marvell.com (Postfix) with ESMTP id A929A3F703F; Mon, 9 Mar 2020 02:09:42 -0700 (PDT) From: Sunil Kumar Kori To: Alfredo Cardigliano CC: , , Sunil Kumar Kori Date: Mon, 9 Mar 2020 14:39:27 +0530 Message-ID: <20200309090927.24206-1-skori@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200309075328.23351-1-skori@marvell.com> References: <20200309075328.23351-1-skori@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-09_02:2020-03-06, 2020-03-09 signatures=0 Subject: [dpdk-dev] [PATCH v3 1/1] net/ionic: use standard stdbool.h 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" Any DPDK public header file which includes stdbool.h may conflict with local definition of bool, if any, which further results in compilation error. To avoid, used standard stdbool.h instead of defining bool internally. I observed this issue during a development where I included rte_uuid.h into rte_ethdev.h. As rte_ethdev.h is included to PMD driver, it started throwing error as given below: CC ionic_rxtx.o In file included from .../dpdk/build/include/rte_uuid.h:17:0, from .../dpdk/build/include/rte_ethdev.h:161, from .../dpdk/build/include/rte_ethdev_driver.h:18, from .../dpdk/drivers/net/ionic/ionic_rxtx.c:34: .../dpdk/drivers/net/ionic/ionic_osdep.h:48:17: error: two or more data types in declaration specifiers typedef uint8_t bool; ^ In file included from .../dpdk/drivers/net/ionic/ionic_dev.h:8:0, from .../dpdk/drivers/net/ionic/ionic.h:13, from .../dpdk/drivers/net/ionic/ionic_mac_api.h:8, from .../dpdk/drivers/net/ionic/ionic_rxtx.c:45: .../dpdk/drivers/net/ionic/ionic_osdep.h:48:1: warning: useless type name in empty declaration typedef uint8_t bool; ^~~~~~~ cc1: warning: unrecognized command line option ‘-Wno-address-of-packed-member’ .../dpdk/mk/internal/rte.compile-pre.mk:114: recipe for target 'ionic_rxtx.o' failed Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter") Cc: stable@dpdk.org Signed-off-by: Sunil Kumar Kori Acked-by: Alfredo Cardigliano --- v3: - remove #define true and false. - add fixes tag. v2: - include stdbool.h in ionic_dev.h drivers/net/ionic/ionic_dev.c | 1 + drivers/net/ionic/ionic_dev.h | 2 ++ drivers/net/ionic/ionic_mac_api.c | 1 + drivers/net/ionic/ionic_main.c | 1 + drivers/net/ionic/ionic_osdep.h | 6 ------ drivers/net/ionic/ionic_rx_filter.c | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index aba388115..fe111a515 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include #include diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index 8c1ec13a6..532255a60 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -5,6 +5,8 @@ #ifndef _IONIC_DEV_H_ #define _IONIC_DEV_H_ +#include + #include "ionic_osdep.h" #include "ionic_if.h" #include "ionic_regs.h" diff --git a/drivers/net/ionic/ionic_mac_api.c b/drivers/net/ionic/ionic_mac_api.c index 189b8b81a..40421fd4e 100644 --- a/drivers/net/ionic/ionic_mac_api.c +++ b/drivers/net/ionic/ionic_mac_api.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include #include "ionic_mac_api.h" diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index b828d230d..9d74ec73e 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved. */ +#include #include diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index ecdbc24e6..e04bb8f65 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -44,12 +44,6 @@ typedef uint16_t __le16; typedef uint32_t __le32; typedef uint64_t __le64; -#ifndef __cplusplus -typedef uint8_t bool; -#define false 0 -#define true 1 -#endif - static inline uint32_t div_round_up(uint32_t n, uint32_t d) { return (n + d - 1) / d; diff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c index f75b81a27..fe624538d 100644 --- a/drivers/net/ionic/ionic_rx_filter.c +++ b/drivers/net/ionic/ionic_rx_filter.c @@ -3,6 +3,7 @@ */ #include +#include #include