From owner-svn-src-all@FreeBSD.ORG  Thu Sep 13 00:42:56 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A4A9110656B9;
	Thu, 13 Sep 2012 00:42:56 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FBF38FC12;
	Thu, 13 Sep 2012 00:42:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8D0guIi081298;
	Thu, 13 Sep 2012 00:42:56 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8D0gu4J081296;
	Thu, 13 Sep 2012 00:42:56 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201209130042.q8D0gu4J081296@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Thu, 13 Sep 2012 00:42:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240430 - head/sys/dev/virtio
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Sep 2012 00:42:56 -0000

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_ */