From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH 5/7] mlx4: fix build with mempool debug enabled Date: Tue, 3 Mar 2015 16:23:48 +0100 Message-ID: <1425396230-13379-6-git-send-email-thomas.monjalon@6wind.com> References: <1425396230-13379-1-git-send-email-thomas.monjalon@6wind.com> To: dev-VfR2kkLFssw@public.gmane.org Return-path: In-Reply-To: <1425396230-13379-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" The mempool header forces error on -Wcast-qual and makes verbs.h failing. Let's include verbs before as a system header. Fixes: 7fae69eeff13 ("mlx4: new poll mode driver") Signed-off-by: Thomas Monjalon --- lib/librte_pmd_mlx4/mlx4.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/librte_pmd_mlx4/mlx4.c b/lib/librte_pmd_mlx4/mlx4.c index 492cbbf..b5774c4 100644 --- a/lib/librte_pmd_mlx4/mlx4.c +++ b/lib/librte_pmd_mlx4/mlx4.c @@ -60,6 +60,16 @@ #include #include +/* Verbs header. */ +/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ +#ifdef PEDANTIC +#pragma GCC diagnostic ignored "-pedantic" +#endif +#include +#ifdef PEDANTIC +#pragma GCC diagnostic error "-pedantic" +#endif + /* DPDK headers don't like -pedantic. */ #ifdef PEDANTIC #pragma GCC diagnostic ignored "-pedantic" @@ -81,18 +91,6 @@ #pragma GCC diagnostic error "-pedantic" #endif -/* Verbs header. */ -/* ISO C doesn't support unnamed structs/unions, disabling -pedantic. */ -#ifdef PEDANTIC -#pragma GCC diagnostic ignored "-pedantic" -#endif - -#include - -#ifdef PEDANTIC -#pragma GCC diagnostic error "-pedantic" -#endif - /* Generated configuration header. */ #include "mlx4_autoconf.h" -- 2.2.2