Module Name: src Committed By: matt Date: Wed Aug 13 22:56:56 UTC 2014
Modified Files: src/sys/arch/alpha/include: int_types.h src/sys/arch/ia64/include: int_types.h src/sys/arch/m68k/include: int_types.h src/sys/arch/mips/include: int_types.h src/sys/arch/powerpc/include: int_types.h src/sys/arch/sh3/include: int_types.h src/sys/arch/sparc/include: int_types.h src/sys/arch/vax/include: int_types.h Log Message: Include <sys/common_int_types.h> if __UINTPTR_TYPE__ is defined. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/int_types.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/int_types.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/int_types.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/include/int_types.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/include/int_types.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sh3/include/int_types.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/int_types.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/vax/include/int_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/alpha/include/int_types.h diff -u src/sys/arch/alpha/include/int_types.h:1.9 src/sys/arch/alpha/include/int_types.h:1.10 --- src/sys/arch/alpha/include/int_types.h:1.9 Sat Dec 24 20:06:46 2005 +++ src/sys/arch/alpha/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.9 2005/12/24 20:06:46 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.10 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -34,6 +34,9 @@ #ifndef _ALPHA_INT_TYPES_H_ #define _ALPHA_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -63,4 +66,6 @@ typedef unsigned long int __uint64_ typedef long int __intptr_t; typedef unsigned long int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_ALPHA_INT_TYPES_H_ */ Index: src/sys/arch/ia64/include/int_types.h diff -u src/sys/arch/ia64/include/int_types.h:1.1 src/sys/arch/ia64/include/int_types.h:1.2 --- src/sys/arch/ia64/include/int_types.h:1.1 Fri Apr 7 14:21:18 2006 +++ src/sys/arch/ia64/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.1 2006/04/07 14:21:18 cherry Exp $ */ +/* $NetBSD: int_types.h,v 1.2 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _IA64_INT_TYPES_H_ #define _IA64_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else /* * 7.18.1 Integer types */ @@ -71,4 +74,6 @@ typedef int __intptr_t; typedef unsigned int __uintptr_t; #endif +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_IA64_INT_TYPES_H_ */ Index: src/sys/arch/m68k/include/int_types.h diff -u src/sys/arch/m68k/include/int_types.h:1.9 src/sys/arch/m68k/include/int_types.h:1.10 --- src/sys/arch/m68k/include/int_types.h:1.9 Sat Dec 24 20:07:15 2005 +++ src/sys/arch/m68k/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.9 2005/12/24 20:07:15 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.10 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _M68K_INT_TYPES_H_ #define _M68K_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -65,4 +68,6 @@ typedef unsigned long long int __uint64_ typedef int __intptr_t; typedef unsigned int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_M68K_INT_TYPES_H_ */ Index: src/sys/arch/mips/include/int_types.h diff -u src/sys/arch/mips/include/int_types.h:1.11 src/sys/arch/mips/include/int_types.h:1.12 --- src/sys/arch/mips/include/int_types.h:1.11 Mon Dec 14 00:46:04 2009 +++ src/sys/arch/mips/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.11 2009/12/14 00:46:04 matt Exp $ */ +/* $NetBSD: int_types.h,v 1.12 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,6 +37,9 @@ #ifndef _MIPS_INT_TYPES_H_ #define _MIPS_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -76,4 +79,6 @@ typedef int __intptr_t; typedef unsigned int __uintptr_t; #endif +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_MIPS_INT_TYPES_H_ */ Index: src/sys/arch/powerpc/include/int_types.h diff -u src/sys/arch/powerpc/include/int_types.h:1.10 src/sys/arch/powerpc/include/int_types.h:1.11 --- src/sys/arch/powerpc/include/int_types.h:1.10 Sat Dec 24 20:07:28 2005 +++ src/sys/arch/powerpc/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.10 2005/12/24 20:07:28 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.11 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,6 +37,9 @@ #ifndef _POWERPC_INT_TYPES_H_ #define _POWERPC_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -76,4 +79,6 @@ typedef int __intptr_t; typedef unsigned int __uintptr_t; #endif +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_POWERPC_INT_TYPES_H_ */ Index: src/sys/arch/sh3/include/int_types.h diff -u src/sys/arch/sh3/include/int_types.h:1.8 src/sys/arch/sh3/include/int_types.h:1.9 --- src/sys/arch/sh3/include/int_types.h:1.8 Sat Dec 24 20:07:32 2005 +++ src/sys/arch/sh3/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.8 2005/12/24 20:07:32 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.9 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _SH3_INT_TYPES_H_ #define _SH3_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -65,4 +68,6 @@ typedef unsigned long long int __uint64_ typedef int __intptr_t; typedef unsigned int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_SH3_INT_TYPES_H_ */ Index: src/sys/arch/sparc/include/int_types.h diff -u src/sys/arch/sparc/include/int_types.h:1.10 src/sys/arch/sparc/include/int_types.h:1.11 --- src/sys/arch/sparc/include/int_types.h:1.10 Sat Dec 24 20:07:32 2005 +++ src/sys/arch/sparc/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.10 2005/12/24 20:07:32 perry Exp $ */ +/* $NetBSD: int_types.h,v 1.11 2014/08/13 22:56:56 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -43,6 +43,9 @@ #ifndef _SPARC_INT_TYPES_H_ #define _SPARC_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -82,4 +85,6 @@ typedef unsigned long long int __uint64_ typedef long int __intptr_t; typedef unsigned long int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_SPARC_INT_TYPES_H_ */ Index: src/sys/arch/vax/include/int_types.h diff -u src/sys/arch/vax/include/int_types.h:1.11 src/sys/arch/vax/include/int_types.h:1.12 --- src/sys/arch/vax/include/int_types.h:1.11 Fri Aug 29 18:25:01 2008 +++ src/sys/arch/vax/include/int_types.h Wed Aug 13 22:56:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: int_types.h,v 1.11 2008/08/29 18:25:01 matt Exp $ */ +/* $NetBSD: int_types.h,v 1.12 2014/08/13 22:56:56 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,9 @@ #ifndef _VAX_INT_TYPES_H_ #define _VAX_INT_TYPES_H_ +#ifdef __UINTPTR_TYPE__ +#include <sys/common_int_types.h> +#else #include <sys/cdefs.h> /* @@ -65,4 +68,6 @@ typedef unsigned long long int __uint64_ typedef long int __intptr_t; typedef unsigned long int __uintptr_t; +#endif /* !__UINTPTR_TYPE__ */ + #endif /* !_VAX_INT_TYPES_H_ */