Author: grehan Date: Thu Sep 13 00:42:56 2012 New Revision: 240430 URL: http://svn.freebsd.org/changeset/base/240430
Log: No need to leak these into the includer's namespace. Submitted by: Bryan Venteicher bryanv at daemoninthecloset org Modified: head/sys/dev/virtio/virtio.h Modified: head/sys/dev/virtio/virtio.h ============================================================================== --- head/sys/dev/virtio/virtio.h Thu Sep 13 00:39:44 2012 (r240429) +++ head/sys/dev/virtio/virtio.h Thu Sep 13 00:42:56 2012 (r240430) @@ -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_DEV 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, VIRTIO_WRITE_IVAR(feature_desc, VIRTIO_IVAR_FEATURE_DESC); +#undef VIRTIO_WRITE_IVAR + #endif /* _VIRTIO_H_ */ _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
