From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id D00B71B492; Thu, 21 Mar 2019 11:10:06 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2019 03:10:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,252,1549958400"; d="scan'208";a="284585323" Received: from silpixa00380299.ir.intel.com ([10.237.223.68]) by orsmga004.jf.intel.com with ESMTP; 21 Mar 2019 03:09:58 -0700 From: Andrius Sirvys To: dev@dpdk.org, Maxime Coquelin , Tiwei Bie , Zhihong Wang Cc: stable@dpdk.org, Andrius Sirvys , jianfeng.tan@intel.com Date: Thu, 21 Mar 2019 10:09:53 +0000 Message-Id: <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> References: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> Subject: [dpdk-dev] [PATCH v2] drivers/virtio: fix duplicate naming of include guard 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: Thu, 21 Mar 2019 10:10:07 -0000 "The macro name '_VHOST_NET_USER_H' of this include guard is used in 2 different header files." lib/librte_vhost/vhost_user.h has the same include guard. Renamed the include guard in vhost.h to differentiate. Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") Cc: jianfeng.tan@intel.com Signed-off-by: Andrius Sirvys Acked-by: Rami Rosen --- v2: changed the name of the variable --- drivers/net/virtio/virtio_user/vhost.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 83a85cc..55f4703 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -2,8 +2,8 @@ * Copyright(c) 2010-2016 Intel Corporation */ -#ifndef _VHOST_NET_USER_H -#define _VHOST_NET_USER_H +#ifndef _VIRTIO_USER_VHOST_H +#define _VIRTIO_USER_VHOST_H #include #include -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 461C7A00E6 for ; Thu, 21 Mar 2019 11:10:09 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0116A1B49C; Thu, 21 Mar 2019 11:10:08 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id D00B71B492; Thu, 21 Mar 2019 11:10:06 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2019 03:10:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,252,1549958400"; d="scan'208";a="284585323" Received: from silpixa00380299.ir.intel.com ([10.237.223.68]) by orsmga004.jf.intel.com with ESMTP; 21 Mar 2019 03:09:58 -0700 From: Andrius Sirvys To: dev@dpdk.org, Maxime Coquelin , Tiwei Bie , Zhihong Wang Cc: stable@dpdk.org, Andrius Sirvys , jianfeng.tan@intel.com Date: Thu, 21 Mar 2019 10:09:53 +0000 Message-Id: <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> References: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com> Subject: [dpdk-dev] [PATCH v2] drivers/virtio: fix duplicate naming of include guard 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190321100953.gQIl7ZBIWtJRfGjzuIVzvSiWH-JlQHCzZ7ny32uqiAM@z> "The macro name '_VHOST_NET_USER_H' of this include guard is used in 2 different header files." lib/librte_vhost/vhost_user.h has the same include guard. Renamed the include guard in vhost.h to differentiate. Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer") Cc: jianfeng.tan@intel.com Signed-off-by: Andrius Sirvys Acked-by: Rami Rosen --- v2: changed the name of the variable --- drivers/net/virtio/virtio_user/vhost.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 83a85cc..55f4703 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -2,8 +2,8 @@ * Copyright(c) 2010-2016 Intel Corporation */ -#ifndef _VHOST_NET_USER_H -#define _VHOST_NET_USER_H +#ifndef _VIRTIO_USER_VHOST_H +#define _VIRTIO_USER_VHOST_H #include #include -- 2.7.4