From owner-p4-projects@FreeBSD.ORG  Mon Feb 16 16:31:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD6EE1065673; Mon, 16 Feb 2009 16:31:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BBF0106564A
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 16:31:20 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A9058FC14
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 16:31:20 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GGVKDB068324
	for <perforce@FreeBSD.org>; Mon, 16 Feb 2009 16:31:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1GGVKrQ068322
	for perforce@freebsd.org; Mon, 16 Feb 2009 16:31:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 16 Feb 2009 16:31:20 GMT
Message-Id: <200902161631.n1GGVKrQ068322@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 157799 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 16:31:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=157799

Change 157799 by hselasky@hselasky_laptop001 on 2009/02/16 16:31:00

	
	Compatibility: Be compatible with Linux Version of 
	videodev header files.

Affected files ...

.. //depot/projects/usb/src/sys/sys/videodev.h#9 edit

Differences ...

==== //depot/projects/usb/src/sys/sys/videodev.h#9 (text+ko) ====

@@ -44,7 +44,12 @@
 #include <sys/stdint.h>
 #include <sys/time.h>
 
-#if !defined(__user)
+#ifndef V4L2_UNION
+/* Default is nameless union */
+#define	V4L2_UNION
+#endif
+
+#ifndef __user
 #define	__user
 #endif
 
@@ -337,7 +342,7 @@
 	union {				/* Frame size */
 		struct v4l2_frmsize_discrete discrete;
 		struct v4l2_frmsize_stepwise stepwise;
-	}	u;
+	}	V4L2_UNION;
 
 	uint32_t reserved[2];		/* Reserved space for future use */
 };
@@ -368,7 +373,7 @@
 	union {				/* Frame interval */
 		struct v4l2_fract discrete;
 		struct v4l2_frmival_stepwise stepwise;
-	}	u;
+	}	V4L2_UNION;
 
 	uint32_t reserved[2];		/* Reserved space for future use */
 };
@@ -694,7 +699,7 @@
 		int32_t	value;
 		int64_t	value64;
 		void   *reserved;
-	}	u;
+	}	V4L2_UNION;
 } __packed;
 
 struct v4l2_ext_controls {
@@ -1129,7 +1134,7 @@
 		struct {
 			uint32_t data[8];
 		}	raw;
-	}	u;
+	}	V4L2_UNION;
 };
 
 #endif