Module Name:    src
Committed By:   christos
Date:           Thu Jan 26 15:55:11 UTC 2017

Modified Files:
        src/sys/arch/acorn32/include: types.h
        src/sys/arch/algor/include: types.h
        src/sys/arch/amd64/include: types.h
        src/sys/arch/arc/include: types.h
        src/sys/arch/arm/include: types.h
        src/sys/arch/cats/include: types.h
        src/sys/arch/cobalt/include: types.h
        src/sys/arch/epoc32/include: types.h
        src/sys/arch/evbarm/include: types.h
        src/sys/arch/evbmips/include: types.h
        src/sys/arch/evbppc/include: types.h
        src/sys/arch/hpcarm/include: types.h
        src/sys/arch/iyonix/include: types.h
        src/sys/arch/mips/include: types.h
        src/sys/arch/netwinder/include: types.h
        src/sys/arch/ofppc/include: types.h
        src/sys/arch/pmax/include: types.h
        src/sys/arch/powerpc/include: types.h
        src/sys/arch/riscv/include: types.h
        src/sys/arch/sbmips/include: types.h
        src/sys/arch/sgimips/include: types.h
        src/sys/arch/shark/include: types.h
        src/sys/arch/sparc64/include: types.h
        src/sys/arch/usermode/include: types.h
        src/sys/arch/zaurus/include: types.h

Log Message:
provide __HAVE_COMPAT_NETBSD32 and fix multiple include protection consistently.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn32/include/types.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/include/types.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arc/include/types.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/types.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/cats/include/types.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cobalt/include/types.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/include/types.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/include/types.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/include/types.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcarm/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/iyonix/include/types.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/mips/include/types.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/netwinder/include/types.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ofppc/include/types.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/pmax/include/types.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sbmips/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/include/types.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/shark/include/types.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/include/types.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/include/types.h

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

Modified files:

Index: src/sys/arch/acorn32/include/types.h
diff -u src/sys/arch/acorn32/include/types.h:1.7 src/sys/arch/acorn32/include/types.h:1.8
--- src/sys/arch/acorn32/include/types.h:1.7	Sun Jan 20 13:09:04 2008
+++ src/sys/arch/acorn32/include/types.h	Thu Jan 26 10:55:08 2017
@@ -1,9 +1,10 @@
-/* $NetBSD: types.h,v 1.7 2008/01/20 18:09:04 joerg Exp $ */
+/* $NetBSD: types.h,v 1.8 2017/01/26 15:55:08 christos Exp $ */
 
-#ifndef _ARM32_TYPES_H_
-#define	_ARM32_TYPES_H_
+#ifndef _ACORN32_TYPES_H_
+#define	_ACORN32_TYPES_H_
 
 #include <arm/arm32/types.h>
 
 #define	__HAVE_DEVICE_REGISTER
+#define	__HAVE_COMPAT_NETBSD32
 #endif

Index: src/sys/arch/algor/include/types.h
diff -u src/sys/arch/algor/include/types.h:1.6 src/sys/arch/algor/include/types.h:1.7
--- src/sys/arch/algor/include/types.h:1.6	Wed Jul 13 00:53:39 2011
+++ src/sys/arch/algor/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,5 +1,11 @@
-/*	$NetBSD: types.h,v 1.6 2011/07/13 04:53:39 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.7 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _ALGOR_TYPES_H_
+#define	_ALGOR_TYPES_H_
 
 #include <mips/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.51 src/sys/arch/amd64/include/types.h:1.52
--- src/sys/arch/amd64/include/types.h:1.51	Fri Feb 26 19:09:45 2016
+++ src/sys/arch/amd64/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.51 2016/02/27 00:09:45 tls Exp $	*/
+/*	$NetBSD: types.h,v 1.52 2017/01/26 15:55:09 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)types.h	7.5 (Berkeley) 3/9/91
  */
 
-#ifndef	_X86_64_MACHTYPES_H_
-#define	_X86_64_MACHTYPES_H_
+#ifndef	_X86_64_TYPES_H_
+#define	_X86_64_TYPES_H_
 
 #ifdef __x86_64__
 
@@ -95,6 +95,7 @@ typedef	unsigned char		__cpu_simple_lock
 #define	__HAVE_COMMON___TLS_GET_ADDR
 #define	__HAVE_INTR_CONTROL
 #define	__HAVE_CPU_RNG
+#define	__HAVE_COMPAT_NETBSD32
 
 #ifdef _KERNEL_OPT
 #define	__HAVE_RAS
@@ -117,4 +118,4 @@ typedef	unsigned char		__cpu_simple_lock
 
 #endif	/*	__x86_64__	*/
 
-#endif	/* _X86_64_MACHTYPES_H_ */
+#endif	/* _X86_64_TYPES_H_ */

Index: src/sys/arch/arc/include/types.h
diff -u src/sys/arch/arc/include/types.h:1.23 src/sys/arch/arc/include/types.h:1.24
--- src/sys/arch/arc/include/types.h:1.23	Sat Jul 16 21:36:51 2011
+++ src/sys/arch/arc/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,9 +1,14 @@
-/*	$NetBSD: types.h,v 1.23 2011/07/17 01:36:51 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.24 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _ARC_TYPES_H_
+#define	_ARC_TYPES_H_
 
 #define	_MIPS_PADDR_T_64BIT
 
 #include <mips/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
-
+#define	__HAVE_COMPAT_NETBSD32
 #define	__HAVE_MIPS_MACHDEP_CACHE_CONFIG
+
+#endif

Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.32 src/sys/arch/arm/include/types.h:1.33
--- src/sys/arch/arm/include/types.h:1.32	Sat Jan 23 17:31:19 2016
+++ src/sys/arch/arm/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.32 2016/01/23 22:31:19 christos Exp $	*/
+/*	$NetBSD: types.h,v 1.33 2017/01/26 15:55:09 christos Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -90,6 +90,7 @@ typedef	int		__register_t;
 #if defined(__ARM_EABI__) && defined(_ARM_ARCH_6)
 #define	__HAVE_ATOMIC64_OPS
 #endif
+#define	__HAVE_COMPAT_NETBSD32
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 #define	PCU_FPU			0

Index: src/sys/arch/cats/include/types.h
diff -u src/sys/arch/cats/include/types.h:1.13 src/sys/arch/cats/include/types.h:1.14
--- src/sys/arch/cats/include/types.h:1.13	Sat Aug 17 16:21:38 2013
+++ src/sys/arch/cats/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.13 2013/08/17 20:21:38 matt Exp $	*/
+/*	$NetBSD: types.h,v 1.14 2017/01/26 15:55:09 christos Exp $	*/
 
 #ifndef _CATS_TYPES_H_
 #define	_CATS_TYPES_H_
@@ -6,5 +6,6 @@
 #define __HAVE_FAST_SOFTINTS
 #include <arm/arm32/types.h>
 #define __HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif

Index: src/sys/arch/cobalt/include/types.h
diff -u src/sys/arch/cobalt/include/types.h:1.11 src/sys/arch/cobalt/include/types.h:1.12
--- src/sys/arch/cobalt/include/types.h:1.11	Sat Jul 16 21:36:51 2011
+++ src/sys/arch/cobalt/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,5 +1,11 @@
-/*	$NetBSD: types.h,v 1.11 2011/07/17 01:36:51 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.12 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _COBALT_TYPES_H_
+#define	_COBALT_TYPES_H_
 
 #include <mips/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/epoc32/include/types.h
diff -u src/sys/arch/epoc32/include/types.h:1.3 src/sys/arch/epoc32/include/types.h:1.4
--- src/sys/arch/epoc32/include/types.h:1.3	Tue May  7 16:42:46 2013
+++ src/sys/arch/epoc32/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,3 +1,10 @@
-/*	$NetBSD: types.h,v 1.3 2013/05/07 20:42:46 matt Exp $	*/
+/*	$NetBSD: types.h,v 1.4 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _EPOC32_TYPES_H_
+#define	_EPOC32_TYPES_H_
 
 #include <arm/arm32/types.h>
+
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/evbarm/include/types.h
diff -u src/sys/arch/evbarm/include/types.h:1.12 src/sys/arch/evbarm/include/types.h:1.13
--- src/sys/arch/evbarm/include/types.h:1.12	Sat Nov 26 11:31:40 2011
+++ src/sys/arch/evbarm/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.12 2011/11/26 16:31:40 skrll Exp $	*/
+/*	$NetBSD: types.h,v 1.13 2017/01/26 15:55:09 christos Exp $	*/
 
 #ifndef _EVBARM_TYPES_H_
 #define	_EVBARM_TYPES_H_
@@ -6,5 +6,6 @@
 #include <arm/arm32/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif

Index: src/sys/arch/evbmips/include/types.h
diff -u src/sys/arch/evbmips/include/types.h:1.9 src/sys/arch/evbmips/include/types.h:1.10
--- src/sys/arch/evbmips/include/types.h:1.9	Sat Jul 16 21:36:51 2011
+++ src/sys/arch/evbmips/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,7 +1,13 @@
-/*	$NetBSD: types.h,v 1.9 2011/07/17 01:36:51 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.10 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _EVBMIPS_TYPES_H_
+#define	_EVBMIPS_TYPES_H_
 
 #define	_MIPS_PADDR_T_64BIT
 
 #include <mips/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/evbppc/include/types.h
diff -u src/sys/arch/evbppc/include/types.h:1.10 src/sys/arch/evbppc/include/types.h:1.11
--- src/sys/arch/evbppc/include/types.h:1.10	Sun Jul 17 19:23:53 2011
+++ src/sys/arch/evbppc/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,5 +1,11 @@
-/*	$NetBSD: types.h,v 1.10 2011/07/17 23:23:53 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.11 2017/01/26 15:55:09 christos Exp $	*/
+
+#ifndef _EVBPPC_TYPES_H_
+#define	_EVBPPC_TYPES_H_
 
 #include <powerpc/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/hpcarm/include/types.h
diff -u src/sys/arch/hpcarm/include/types.h:1.15 src/sys/arch/hpcarm/include/types.h:1.16
--- src/sys/arch/hpcarm/include/types.h:1.15	Tue May  7 16:42:46 2013
+++ src/sys/arch/hpcarm/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.15 2013/05/07 20:42:46 matt Exp $ */
+/* $NetBSD: types.h,v 1.16 2017/01/26 15:55:09 christos Exp $ */
 
 #ifndef _HPCARM_TYPES_H_
 #define	_HPCARM_TYPES_H_
@@ -6,6 +6,7 @@
 #include <arm/arm32/types.h>
 
 #define	__HAVE_DEVICE_REGISTER
+#define	__HAVE_COMPAT_NETBSD32
 #define	__GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
 
 #endif

Index: src/sys/arch/iyonix/include/types.h
diff -u src/sys/arch/iyonix/include/types.h:1.9 src/sys/arch/iyonix/include/types.h:1.10
--- src/sys/arch/iyonix/include/types.h:1.9	Sun Jul 17 19:46:49 2011
+++ src/sys/arch/iyonix/include/types.h	Thu Jan 26 10:55:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.9 2011/07/17 23:46:49 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.10 2017/01/26 15:55:09 christos Exp $	*/
 
 #ifndef _IYONIX_TYPES_H_
 #define	_IYONIX_TYPES_H_
@@ -6,5 +6,6 @@
 #include <arm/arm32/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif

Index: src/sys/arch/mips/include/types.h
diff -u src/sys/arch/mips/include/types.h:1.64 src/sys/arch/mips/include/types.h:1.65
--- src/sys/arch/mips/include/types.h:1.64	Mon Jul 11 12:15:35 2016
+++ src/sys/arch/mips/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.64 2016/07/11 16:15:35 matt Exp $	*/
+/*	$NetBSD: types.h,v 1.65 2017/01/26 15:55:10 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
  */
 
-#ifndef	_MACHTYPES_H_
-#define	_MACHTYPES_H_
+#ifndef	_MIPS_TYPES_H_
+#define	_MIPS_TYPES_H_
 
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>
@@ -168,5 +168,6 @@ typedef __uint32_t tlb_asid_t;
 #define	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 #define	__HAVE_MM_MD_KERNACC
 #define	__HAVE_MM_MD_CACHE_ALIASING
+#define	__HAVE_COMPAT_NETBSD32
 
-#endif	/* _MACHTYPES_H_ */
+#endif	/* _MIPS_TYPES_H_ */

Index: src/sys/arch/netwinder/include/types.h
diff -u src/sys/arch/netwinder/include/types.h:1.11 src/sys/arch/netwinder/include/types.h:1.12
--- src/sys/arch/netwinder/include/types.h:1.11	Sun Jul 17 19:46:49 2011
+++ src/sys/arch/netwinder/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,10 +1,11 @@
-/* $NetBSD: types.h,v 1.11 2011/07/17 23:46:49 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $ */
 
-#ifndef _ARM32_TYPES_H_
-#define	_ARM32_TYPES_H_
+#ifndef _NETWINDER_TYPES_H_
+#define	_NETWINDER_TYPES_H_
 
 #include <arm/arm32/types.h>
 
 #define __HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif

Index: src/sys/arch/ofppc/include/types.h
diff -u src/sys/arch/ofppc/include/types.h:1.11 src/sys/arch/ofppc/include/types.h:1.12
--- src/sys/arch/ofppc/include/types.h:1.11	Sun Jul 17 19:23:53 2011
+++ src/sys/arch/ofppc/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,5 +1,11 @@
-/*	$NetBSD: types.h,v 1.11 2011/07/17 23:23:53 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $	*/
+
+#ifndef _OFPPC_TYPES_H_
+#define	_OFPPC_TYPES_H_
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
 
 #include <powerpc/types.h>
+
+#endif

Index: src/sys/arch/pmax/include/types.h
diff -u src/sys/arch/pmax/include/types.h:1.25 src/sys/arch/pmax/include/types.h:1.26
--- src/sys/arch/pmax/include/types.h:1.25	Sun Jan 20 13:09:08 2008
+++ src/sys/arch/pmax/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,9 +1,15 @@
-/*	$NetBSD: types.h,v 1.25 2008/01/20 18:09:08 joerg Exp $	*/
+/*	$NetBSD: types.h,v 1.26 2017/01/26 15:55:10 christos Exp $	*/
+
+#ifndef _PMAX_TYPES_H_
+#define	_PMAX_TYPES_H_
 
 #include <mips/types.h>
 
 #define	__HAVE_DEVICE_REGISTER
+#define	__HAVE_COMPAT_NETBSD32
 
 /* MIPS specific options */
 #define	__HAVE_BOOTINFO_H
 #define	__HAVE_MIPS_MACHDEP_CACHE_CONFIG
+
+#endif

Index: src/sys/arch/powerpc/include/types.h
diff -u src/sys/arch/powerpc/include/types.h:1.54 src/sys/arch/powerpc/include/types.h:1.55
--- src/sys/arch/powerpc/include/types.h:1.54	Sun Jan 24 14:49:35 2016
+++ src/sys/arch/powerpc/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.54 2016/01/24 19:49:35 christos Exp $	*/
+/*	$NetBSD: types.h,v 1.55 2017/01/26 15:55:10 christos Exp $	*/
 
 /*-
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -31,8 +31,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MACHTYPES_H_
-#define	_MACHTYPES_H_
+#ifndef	_POWERPC_TYPES_H_
+#define	_POWERPC_TYPES_H_
 
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>
@@ -99,5 +99,6 @@ typedef __uint32_t tlb_asid_t;		/* for b
 #if defined(_KERNEL)
 #define	__HAVE_RAS
 #endif
+#define	__HAVE_COMPAT_NETBSD32
 
-#endif	/* _MACHTYPES_H_ */
+#endif	/* _POWERPC_TYPES_H_ */

Index: src/sys/arch/riscv/include/types.h
diff -u src/sys/arch/riscv/include/types.h:1.5 src/sys/arch/riscv/include/types.h:1.6
--- src/sys/arch/riscv/include/types.h:1.5	Sat Jan 23 17:31:20 2016
+++ src/sys/arch/riscv/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.5 2016/01/23 22:31:20 christos Exp $ */
+/* $NetBSD: types.h,v 1.6 2017/01/26 15:55:10 christos Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -99,6 +99,7 @@ typedef __int32_t	__register_t;
 
 //#define __HAVE_NEW_STYLE_BUS_H
 #define __HAVE_NO_BUS_DMA
+#define	__HAVE_COMPAT_NETBSD32
 
 //#if defined(_KERNEL)
 //#define __HAVE_RAS

Index: src/sys/arch/sbmips/include/types.h
diff -u src/sys/arch/sbmips/include/types.h:1.9 src/sys/arch/sbmips/include/types.h:1.10
--- src/sys/arch/sbmips/include/types.h:1.9	Sun Jul 17 19:49:46 2011
+++ src/sys/arch/sbmips/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,7 +1,13 @@
-/* $NetBSD: types.h,v 1.9 2011/07/17 23:49:46 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.10 2017/01/26 15:55:10 christos Exp $ */
+
+#ifndef _SBMIPS_TYPES_H_
+#define	_SBMIPS_TYPES_H_
 
 #define	_MIPS_PADDR_T_64BIT
 
 #include <mips/types.h>
 
 #define	__HAVE_NEW_STYLE_BUS_H
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/sgimips/include/types.h
diff -u src/sys/arch/sgimips/include/types.h:1.16 src/sys/arch/sgimips/include/types.h:1.17
--- src/sys/arch/sgimips/include/types.h:1.16	Sat Jul 16 21:36:50 2011
+++ src/sys/arch/sgimips/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,7 @@
-/*	$NetBSD: types.h,v 1.16 2011/07/17 01:36:50 dyoung Exp $	*/
+/*	$NetBSD: types.h,v 1.17 2017/01/26 15:55:10 christos Exp $	*/
+
+#ifndef _SGIMIPS_TYPES_H_
+#define	_SGIMIPS_TYPES_H_
 
 #define _MIPS_PADDR_T_64BIT
 
@@ -9,3 +12,6 @@
 /* MIPS specific options */
 #define	__HAVE_BOOTINFO_H
 #define	__HAVE_MIPS_MACHDEP_CACHE_CONFIG
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/shark/include/types.h
diff -u src/sys/arch/shark/include/types.h:1.9 src/sys/arch/shark/include/types.h:1.10
--- src/sys/arch/shark/include/types.h:1.9	Sun Jan 20 13:09:09 2008
+++ src/sys/arch/shark/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.9 2008/01/20 18:09:09 joerg Exp $	*/
+/*	$NetBSD: types.h,v 1.10 2017/01/26 15:55:10 christos Exp $	*/
 
 #ifndef _SHARK_TYPES_H_
 #define	_SHARK_TYPES_H_
@@ -9,5 +9,6 @@
 #define	__ARM_FIQ_INDIRECT
 
 #define	__HAVE_DEVICE_REGISTER
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif /* _SHARK_TYPES_H_ */

Index: src/sys/arch/sparc64/include/types.h
diff -u src/sys/arch/sparc64/include/types.h:1.26 src/sys/arch/sparc64/include/types.h:1.27
--- src/sys/arch/sparc64/include/types.h:1.26	Thu Nov 14 07:11:13 2013
+++ src/sys/arch/sparc64/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,7 +1,14 @@
-/*       $NetBSD: types.h,v 1.26 2013/11/14 12:11:13 martin Exp $        */
+/*       $NetBSD: types.h,v 1.27 2017/01/26 15:55:10 christos Exp $        */
+
+#ifndef _SPARC64_TYPES_H_
+#define	_SPARC64_TYPES_H_
 
 #include <sparc/types.h>
 
 #ifdef __arch64__
 #define	MD_TOPDOWN_INIT(epp)	/* no topdown VM flag for exec by default */
 #endif
+
+#define	__HAVE_COMPAT_NETBSD32
+
+#endif

Index: src/sys/arch/usermode/include/types.h
diff -u src/sys/arch/usermode/include/types.h:1.11 src/sys/arch/usermode/include/types.h:1.12
--- src/sys/arch/usermode/include/types.h:1.11	Sat Jan 23 17:31:20 2016
+++ src/sys/arch/usermode/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.11 2016/01/23 22:31:20 christos Exp $ */
+/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -26,8 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARCH_USERMODE_INCLUDE_TYPES_H
-#define _ARCH_USERMODE_INCLUDE_TYPES_H
+#ifndef _USERMODE_TYPES_H_
+#define _USERMODE_TYPES_H_
 
 #include <sys/cdefs.h>
 #include <sys/featuretest.h>
@@ -68,5 +68,6 @@ typedef long int	__register_t;
 
 #define __HAVE_CPU_DATA_FIRST
 #define __HAVE_MM_MD_KERNACC
+#define	__HAVE_COMPAT_NETBSD32
 
-#endif /* !_ARCH_USERMODE_INCLUDE_TYPES_H */
+#endif /* !_USERMODE_TYPES_H_ */

Index: src/sys/arch/zaurus/include/types.h
diff -u src/sys/arch/zaurus/include/types.h:1.6 src/sys/arch/zaurus/include/types.h:1.7
--- src/sys/arch/zaurus/include/types.h:1.6	Sun Jan 20 13:09:10 2008
+++ src/sys/arch/zaurus/include/types.h	Thu Jan 26 10:55:10 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: types.h,v 1.6 2008/01/20 18:09:10 joerg Exp $	*/
+/*	$NetBSD: types.h,v 1.7 2017/01/26 15:55:10 christos Exp $	*/
 
 #ifndef _ZAURUS_TYPES_H_
 #define	_ZAURUS_TYPES_H_
@@ -6,5 +6,6 @@
 #include <arm/arm32/types.h>
 
 #define	__HAVE_DEVICE_REGISTER
+#define	__HAVE_COMPAT_NETBSD32
 
 #endif	/* _ZAURUS_TYPES_H_ */

Reply via email to