Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/types.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/types.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.77.12.2
retrieving revision 1.78
diff -u -p -r1.77.12.2 -r1.78
--- src/sys/sys/types.h	2008/01/23 19:27:49	1.77.12.2
+++ src/sys/sys/types.h	2008/01/15 03:37:12	1.78
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.77.12.2 2008/01/23 19:27:49 bouyer Exp $	*/
+/*	$NetBSD: types.h,v 1.78 2008/01/15 03:37:12 rmind Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993, 1994
@@ -107,6 +107,8 @@ typedef unsigned char	unchar;		/* Sys V 
 typedef	unsigned short	ushort;		/* Sys V compatibility */
 typedef	unsigned int	uint;		/* Sys V compatibility */
 typedef unsigned long	ulong;		/* Sys V compatibility */
+
+typedef	u_long		cpuid_t;
 #endif
 
 typedef	uint64_t	u_quad_t;	/* quads */
@@ -197,8 +199,6 @@ typedef	int32_t		dtime_t;	/* on-disk tim
 
 typedef int		mqd_t;
 
-typedef	unsigned long	cpuid_t;
-
 typedef	int		psetid_t;
 
 #if defined(_KERNEL) || defined(_STANDALONE)