Module Name: src Committed By: christos Date: Tue Mar 18 17:11:19 UTC 2014
Modified Files: src/sys/arch/alpha/include: cdefs.h src/sys/arch/arm/include: cdefs.h src/sys/arch/hppa/include: cdefs.h src/sys/arch/ia64/include: cdefs.h src/sys/arch/mips/include: cdefs.h src/sys/arch/sparc/include: cdefs.h Log Message: Make all __ALIGNBYTES macros return the same type (size_t) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/cdefs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/cdefs.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/include/cdefs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/cdefs.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/cdefs.h diff -u src/sys/arch/alpha/include/cdefs.h:1.12 src/sys/arch/alpha/include/cdefs.h:1.13 --- src/sys/arch/alpha/include/cdefs.h:1.12 Fri Jan 20 09:08:05 2012 +++ src/sys/arch/alpha/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,8 +1,8 @@ -/* $NetBSD: cdefs.h,v 1.12 2012/01/20 14:08:05 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_MACHINE_CDEFS_H_ */ Index: src/sys/arch/arm/include/cdefs.h diff -u src/sys/arch/arm/include/cdefs.h:1.12 src/sys/arch/arm/include/cdefs.h:1.13 --- src/sys/arch/arm/include/cdefs.h:1.12 Tue Jan 28 20:20:03 2014 +++ src/sys/arch/arm/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.12 2014/01/29 01:20:03 matt Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _ARM_CDEFS_H_ #define _ARM_CDEFS_H_ @@ -50,7 +50,7 @@ #endif #if defined(__ARM_EABI__) || defined(__ARM_PCS_AAPCS64) -#define __ALIGNBYTES (8 - 1) +#define __ALIGNBYTES ((size_t)(8 - 1)) #else #define __ALIGNBYTES (sizeof(int) - 1) #endif Index: src/sys/arch/hppa/include/cdefs.h diff -u src/sys/arch/hppa/include/cdefs.h:1.2 src/sys/arch/hppa/include/cdefs.h:1.3 --- src/sys/arch/hppa/include/cdefs.h:1.2 Fri Jan 20 09:08:05 2012 +++ src/sys/arch/hppa/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.2 2012/01/20 14:08:05 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.3 2014/03/18 17:11:19 christos Exp $ */ #ifndef _HPPA_CDEFS_H_ #define _HPPA_CDEFS_H_ @@ -10,6 +10,6 @@ */ #define __ASM_DELIMITER "\n\t" -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_HPPA_CDEFS_H_ */ Index: src/sys/arch/ia64/include/cdefs.h diff -u src/sys/arch/ia64/include/cdefs.h:1.2 src/sys/arch/ia64/include/cdefs.h:1.3 --- src/sys/arch/ia64/include/cdefs.h:1.2 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/ia64/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.2 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.3 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ @@ -8,6 +8,6 @@ #define __ELF__ #endif -#define __ALIGNBYTES 15 +#define __ALIGNBYTES ((size_t)15) #endif /* !_MACHINE_CDEFS_H_ */ Index: src/sys/arch/mips/include/cdefs.h diff -u src/sys/arch/mips/include/cdefs.h:1.14 src/sys/arch/mips/include/cdefs.h:1.15 --- src/sys/arch/mips/include/cdefs.h:1.14 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/mips/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.14 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.15 2014/03/18 17:11:19 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -71,6 +71,6 @@ #define _MIPS_ISA_MIPS32 5 #define _MIPS_ISA_MIPS64 6 -#define __ALIGNBYTES 7 +#define __ALIGNBYTES ((size_t)7) #endif /* !_MIPS_CDEFS_H_ */ Index: src/sys/arch/sparc/include/cdefs.h diff -u src/sys/arch/sparc/include/cdefs.h:1.12 src/sys/arch/sparc/include/cdefs.h:1.13 --- src/sys/arch/sparc/include/cdefs.h:1.12 Fri Jan 20 09:08:06 2012 +++ src/sys/arch/sparc/include/cdefs.h Tue Mar 18 13:11:19 2014 @@ -1,13 +1,13 @@ -/* $NetBSD: cdefs.h,v 1.12 2012/01/20 14:08:06 joerg Exp $ */ +/* $NetBSD: cdefs.h,v 1.13 2014/03/18 17:11:19 christos Exp $ */ #ifndef _MACHINE_CDEFS_H_ #define _MACHINE_CDEFS_H_ /* No arch-specific cdefs. */ #ifdef __arch64__ -#define __ALIGNBYTES 0xf +#define __ALIGNBYTES ((size_t)0xf) #else -#define __ALIGNBYTES 0x7 +#define __ALIGNBYTES ((size_t)0x7) #endif #endif /* !_MACHINE_CDEFS_H_ */