On Thu, Mar 21, 2019 at 10:09:53AM +0000, Andrius Sirvys wrote: > "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....@intel.com > Signed-off-by: Andrius Sirvys <andrius.sir...@intel.com> > Acked-by: Rami Rosen <ramir...@gmail.com> > --- > 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 <stdint.h> > #include <linux/types.h> > -- > 2.7.4
Reviewed-by: Tiwei Bie <tiwei....@intel.com>