From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrien Mazarguil Subject: [PATCH v3 12/14] ethdev: fix C++ errors in flow API (MPLS, GRE) Date: Wed, 26 Apr 2017 14:07:20 +0200 Message-ID: <585dcdd594139bfa4f47616a5c090f2236b916d0.1493208189.git.adrien.mazarguil@6wind.com> References: To: dev@dpdk.org Return-path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 4B92A688B for ; Wed, 26 Apr 2017 14:07:48 +0200 (CEST) Received: by mail-wm0-f53.google.com with SMTP id w64so48426294wma.0 for ; Wed, 26 Apr 2017 05:07:48 -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 g21sm42254wrg.22.2017.04.26.05.07.46 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 26 Apr 2017 05:07:46 -0700 (PDT) In-Reply-To: List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit addresses the following compilation errors: In file included from build/include/rte_flow_driver.h:50:0, from /tmp/check-includes.sh.1397.cc:1: build/include/rte_flow.h:631:1: error: C99 designator 'label_tc_s' outside aggregate initializer [...] build/include/rte_flow.h:631:1: error: initializer-string for array of chars is too long [-fpermissive] [...] build/include/rte_flow.h:650:1: sorry, unimplemented: non-trivial designated initializers not supported [...] C++ does not support the C99-style designated initializers used in this file for the default item masks. While the resulting symbols are primarily useful to PMDs (written in C), they are exposed as part of the public API for documentation purposes and to assist application writers. Considering that: - using pre-C99 initialization style for compatibility with C++ would render them difficult to understand (all struct members must be initialized) - using both initialization styles would be needlessly verbose - not exposing them at all would defeat their purpose - applications do not normally need these symbols at run time This commit hides these symbols from C++ applications. Specific C++ initializers will be added later if necessary. Fixes: 7cd048321d1d ("ethdev: add MPLS and GRE flow API items") Signed-off-by: Adrien Mazarguil Acked-by: Beilei Xing Acked-by: Shahaf Shuler --- lib/librte_ether/rte_flow.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index bc7bc45..abd4c6a 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -652,9 +652,11 @@ struct rte_flow_item_mpls { }; /** Default mask for RTE_FLOW_ITEM_TYPE_MPLS. */ +#ifndef __cplusplus static const struct rte_flow_item_mpls rte_flow_item_mpls_mask = { .label_tc_s = "\xff\xff\xf0", }; +#endif /** * RTE_FLOW_ITEM_TYPE_GRE. @@ -671,9 +673,11 @@ struct rte_flow_item_gre { }; /** Default mask for RTE_FLOW_ITEM_TYPE_GRE. */ +#ifndef __cplusplus static const struct rte_flow_item_gre rte_flow_item_gre_mask = { .protocol = 0xffff, }; +#endif /** * Matching pattern item definition. -- 2.1.4