diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-07-10 02:27:16 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-07-10 02:27:16 +0000 |
| commit | 2e480d34aaabcd405e72ff80866451e8c3b08c08 (patch) | |
| tree | 42debb467f1f9ffcad43a252efb81d84fb61db3d /sys/i386 | |
| parent | f763857cffe9dbe1a3486de1191ed10acf2f1138 (diff) | |
| download | src-2e480d34aaabcd405e72ff80866451e8c3b08c08.tar.gz src-2e480d34aaabcd405e72ff80866451e8c3b08c08.zip | |
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 <machine/profile.h> to a kernel-only typedef
in <machine/types.h>. Kludged libc/gmon/mcount.c so that it can
still see this typedef.
Notes
Notes:
svn path=/head/; revision=37540
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/profile.h | 5 | ||||
| -rw-r--r-- | sys/i386/include/types.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index 44da274435ff..e3da51ad8f1b 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 50f9c333d6db..45be306da2cb 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 |