From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Sune Subject: [PATCH] cryptodev: fix RTE_PMD_DEBUG_TRACE redefinition Date: Thu, 3 Mar 2016 00:34:37 +0100 Message-ID: <1456961677-1116-1-git-send-email-marcdevel@gmail.com> To: dev@dpdk.org Return-path: Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id 6BCA71C52 for ; Thu, 3 Mar 2016 00:34:42 +0100 (CET) Received: by mail-wm0-f43.google.com with SMTP id l68so108250532wml.0 for ; Wed, 02 Mar 2016 15:34:42 -0800 (PST) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" RTE_PMD_DEBUG_TRACE used RTE_FUNC_PTR_OR_ERR_RET was redefined in rte_cryptodev_pmd.h which produced MACRO redefinition warnings when including both rte_cryptodev_pmd.h and rte_ethdev.h. This commit moves MACRO definition to rte_cryptodev.c to prevent this warning. --- lib/librte_cryptodev/rte_cryptodev.c | 7 +++++++ lib/librte_cryptodev/rte_cryptodev_pmd.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 2838852..90d2c30 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -71,6 +71,13 @@ #include "rte_cryptodev.h" #include "rte_cryptodev_pmd.h" +#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG +#define RTE_PMD_DEBUG_TRACE(...) \ + rte_pmd_debug_trace(__func__, __VA_ARGS__) +#else +#define RTE_PMD_DEBUG_TRACE(fmt, args...) +#endif + struct rte_cryptodev rte_crypto_devices[RTE_CRYPTO_MAX_DEVS]; struct rte_cryptodev *rte_cryptodevs = &rte_crypto_devices[0]; diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index 8270afa..c43680f 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -62,13 +62,6 @@ struct rte_cryptodev_qp_conf; enum rte_cryptodev_event_type; -#ifdef RTE_LIBRTE_CRYPTODEV_DEBUG -#define RTE_PMD_DEBUG_TRACE(...) \ - rte_pmd_debug_trace(__func__, __VA_ARGS__) -#else -#define RTE_PMD_DEBUG_TRACE(fmt, args...) -#endif - struct rte_cryptodev_session { struct { uint8_t dev_id; -- 2.1.4