From 60ff33428504293cd82fc9b921acd39604d352b2 Mon Sep 17 00:00:00 2001 From: Peter Grehan Date: Thu, 13 Sep 2012 00:42:56 +0000 Subject: [PATCH] No need to leak these into the includer's namespace. Submitted by: Bryan Venteicher bryanv at daemoninthecloset org --- sys/dev/virtio/virtio.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h index 8c22b12e7c9..e8cdaf8e6eb 100644 --- a/sys/dev/virtio/virtio.h +++ b/sys/dev/virtio/virtio.h @@ -151,6 +151,8 @@ VIRTIO_RDWR_DEVICE_CONFIG(1, uint8_t); VIRTIO_RDWR_DEVICE_CONFIG(2, uint16_t); VIRTIO_RDWR_DEVICE_CONFIG(4, uint32_t); +#undef VIRTIO_RDWR_DEVICE_CONFIG + #define VIRTIO_READ_IVAR(name, ivar) \ static inline int \ __CONCAT(virtio_get_,name)(device_t dev) \ @@ -166,6 +168,8 @@ VIRTIO_READ_IVAR(device, VIRTIO_IVAR_DEVICE); VIRTIO_READ_IVAR(subvendor, VIRTIO_IVAR_SUBVENDOR); VIRTIO_READ_IVAR(subdevice, VIRTIO_IVAR_SUBDEVICE); +#undef VIRTIO_READ_IVAR + #define VIRTIO_WRITE_IVAR(name, ivar) \ static inline void \ __CONCAT(virtio_set_,name)(device_t dev, void *val) \ @@ -175,4 +179,6 @@ __CONCAT(virtio_set_,name)(device_t dev, void *val) \ VIRTIO_WRITE_IVAR(feature_desc, VIRTIO_IVAR_FEATURE_DESC); +#undef VIRTIO_WRITE_IVAR + #endif /* _VIRTIO_H_ */