From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id 97F8E5942 for ; Wed, 26 Apr 2017 14:07:42 +0200 (CEST) Received: by mail-wm0-f41.google.com with SMTP id r190so2020960wme.1 for ; Wed, 26 Apr 2017 05:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=CpWVvijc3IDKxHvRT5D0SsSn7E7nNCu/SzvhfSU42Do=; b=tvi2X2NJmKnv4XxjQXGfgWXC0jhKOgN1QCzCcaBROPwB6gZHcagMCIoVri64qlAN8a zj2ROyNU4TI/PmDJlBvi7iKa3siGW2/LEQ8v7BioElCt38un61pgl019AHoldGQWtpwS bQHXM4Nv/nEvCI1cSEinQmEh+8y+HdKMKW7l02jQGniR3eT5oiFEp19dhgeBXdxFVT06 BOb+wMwujKdXI227o1sjKDZB5WvSoG1c4JZREgaPrRt6ei93jmuGboqQilrSXngxFIGf JHt2q4WHUeFbCYjx/vvnOR5bjZiXY75b0YIKATHvBKBsY1U5WuUw6ygZL4GB6WfIVinA /H3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=CpWVvijc3IDKxHvRT5D0SsSn7E7nNCu/SzvhfSU42Do=; b=ZxCGmZZF1iEpJoIxMHr0C3Q9UuSIuvWaYKq6HJz7xN9Zi8lAdTc2EZk3HQFUn+Oys9 ENhnJFkiEILQSDyqSbjPa4QnPCHCR1/NdNeAIp4Wl8/zJk7eLUywGMw5QqDhf3GEp/Cv 5FAvFB1HbhVRlrjsXXj1xLjRXGpwT47PzKALLFLH6SbjVRSaQ3idVyMx+YtX4FYN13v6 uovIuyLXhw/y32mqqOu4QdZW8bUOsCECePLMZdzlrh/r1mTTCZs+BKhAeMicgkv9a4xl f907mqJv490qeKhUmsIFvJfjZtvZtjYggr5N4jPELZ7968ozG6jcYQS6oVcybxFYyKDY 99bg== X-Gm-Message-State: AN3rC/7RgNbuVPDtp1XmB4YHbpKZMHNUWdEpM4DnKOPCJxhf9pYdfQgb tCsNu3vOnh2hKXEInUI= X-Received: by 10.28.100.195 with SMTP id y186mr5546808wmb.68.1493208462152; Wed, 26 Apr 2017 05:07:42 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id r60sm43063wrb.37.2017.04.26.05.07.41 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 26 Apr 2017 05:07:41 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Wed, 26 Apr 2017 14:07:15 +0200 Message-Id: <97d89ae0c65d76f6a7e11b4dd195eb2f4c92a52c.1493208189.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 07/14] net/avp: fix errors in exported headers 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: , X-List-Received-Date: Wed, 26 Apr 2017 12:07:43 -0000 This commit addresses several errors related to missing includes such as: In file included from /tmp/check-includes.sh.15315.c:1:0: build/include/rte_avp_fifo.h:77:22: error: 'struct rte_avp_fifo' declared inside parameter list [-Werror] [...] build/include/rte_avp_fifo.h: In function 'avp_fifo_init': build/include/rte_avp_fifo.h:81:3: error: implicit declaration of function 'rte_panic' [-Werror=implicit-function-declaration] [...] build/include/rte_avp_fifo.h:83:6: error: dereferencing pointer to incomplete type [...] build/include/rte_avp_fifo.h:109:2: error: implicit declaration of function 'rte_wmb' [-Werror=implicit-function-declaration] [...] In file included from /tmp/check-includes.sh.15315.c:1:0: build/include/rte_avp_common.h:104:2: error: unknown type name 'uint64_t' [...] build/include/rte_avp_common.h:386:15: error: 'ETHER_ADDR_LEN' undeclared here (not in a function) [...] It addresses errors with strict compilation flags: In file included from /tmp/check-includes.sh.15315.c:1:0: build/include/rte_avp_common.h:122:3: error: ISO C99 doesn't support unnamed structs/unions [-Werror=pedantic] [...] build/include/rte_avp_common.h:136:17: error: ISO C forbids zero-size array 'buffer' [-Werror=pedantic] [...] And also adds C++ awareness to both header files. Fixes: 8e680655e205 ("net/avp: add public header files") Signed-off-by: Adrien Mazarguil Acked-by: Allain Legacy --- drivers/net/avp/rte_avp_common.h | 18 +++++++++++++++++- drivers/net/avp/rte_avp_fifo.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/net/avp/rte_avp_common.h b/drivers/net/avp/rte_avp_common.h index 31d763e..488d721 100644 --- a/drivers/net/avp/rte_avp_common.h +++ b/drivers/net/avp/rte_avp_common.h @@ -59,6 +59,17 @@ #ifdef __KERNEL__ #include +#define RTE_STD_C11 +#else +#include +#include +#include +#include +#include +#endif + +#ifdef __cplusplus +extern "C" { #endif /** @@ -115,6 +126,7 @@ struct rte_avp_device_config { */ struct rte_avp_request { uint32_t req_id; /**< Request id */ + RTE_STD_C11 union { uint32_t new_mtu; /**< New MTU */ uint8_t if_up; /**< 1: interface up, 0: interface down */ @@ -133,7 +145,7 @@ struct rte_avp_fifo { volatile unsigned int read; /**< Next position to be read */ unsigned int len; /**< Circular buffer length */ unsigned int elem_size; /**< Pointer size - for 32/64 bit OS */ - void *volatile buffer[0]; /**< The buffer contains mbuf pointers */ + void *volatile buffer[]; /**< The buffer contains mbuf pointers */ }; @@ -413,4 +425,8 @@ struct rte_avp_device_info { #define RTE_AVP_IOCTL_RELEASE _IOWR(0, 3, struct rte_avp_device_info) #define RTE_AVP_IOCTL_QUERY _IOWR(0, 4, struct rte_avp_device_config) +#ifdef __cplusplus +} +#endif + #endif /* _RTE_AVP_COMMON_H_ */ diff --git a/drivers/net/avp/rte_avp_fifo.h b/drivers/net/avp/rte_avp_fifo.h index 8262e4f..803eb80 100644 --- a/drivers/net/avp/rte_avp_fifo.h +++ b/drivers/net/avp/rte_avp_fifo.h @@ -57,6 +57,12 @@ #ifndef _RTE_AVP_FIFO_H_ #define _RTE_AVP_FIFO_H_ +#include "rte_avp_common.h" + +#ifdef __cplusplus +extern "C" { +#endif + #ifdef __KERNEL__ /* Write memory barrier for kernel compiles */ #define AVP_WMB() smp_wmb() @@ -70,6 +76,8 @@ #endif #ifndef __KERNEL__ +#include + /** * Initializes the avp fifo structure */ @@ -154,4 +162,8 @@ avp_fifo_free_count(struct rte_avp_fifo *fifo) return (fifo->read - fifo->write - 1) & (fifo->len - 1); } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_AVP_FIFO_H_ */ -- 2.1.4