From 63dd5b520f4e0ad42df07e66779dc70b7b6f0037 Mon Sep 17 00:00:00 2001 From: bde Date: Fri, 10 Jul 1998 02:27:16 +0000 Subject: Added a kernel-only typedef (ptrint_t) giving an integral type that is least unsuitable for holding an object pointer. This should have been used to fix warnings about casts between pointers and ints on alphas. Moved corresponding existing general typedef (fptrint_t) for function pointers from the i386 to a kernel-only typedef in . Kludged libc/gmon/mcount.c so that it can still see this typedef. --- sys/i386/include/profile.h | 5 +---- sys/i386/include/types.h | 8 +++++++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'sys/i386') diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 44da274..e3da51a 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.13 1997/12/15 02:18:30 tegge Exp $ + * $Id: profile.h,v 1.14 1998/02/03 20:32:38 bde Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -103,9 +103,6 @@ mcount() \ } #endif /* KERNEL */ -/* An unsigned integral type that can hold function pointers. */ -typedef u_int fptrint_t; - /* * An unsigned integral type that can hold non-negative difference between * function pointers. diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index 50f9c33..45be306 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $Id: types.h,v 1.12 1998/06/14 14:08:21 bde Exp $ + * $Id: types.h,v 1.13 1998/06/18 15:32:05 bde Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -70,6 +70,12 @@ typedef int32_t register_t; typedef int32_t ufs_daddr_t; #ifdef KERNEL +/* An unsigned integral type that can hold object pointers. */ +typedef u_int32_t ptrint_t; + +/* An unsigned integral type that can hold function pointers. */ +typedef u_int32_t fptrint_t; + typedef __uint64_t uoff_t; /* unsigned file offset */ #endif -- cgit v1.1