From 1708804ea977668f82a944b29399d376f8e50e9f Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Thu, 21 Mar 2019 10:09:53 +0000 Subject: [PATCH] net/virtio: fix duplicate naming of include guard "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: stable@dpdk.org Signed-off-by: Andrius Sirvys Acked-by: Rami Rosen Reviewed-by: Tiwei Bie --- 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 83a85cc6f1..55f47036bb 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.20.1