diff options
| author | bde <bde@FreeBSD.org> | 1998-07-10 09:26:41 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-10 09:26:41 +0000 |
| commit | 4579a954ade046fd3ad0427b6b21347f063751d3 (patch) | |
| tree | 2c815c06d4c39e37a2debc8193feda4989a2a3a1 | |
| parent | 4c73b80db0d2882b6706a48673ec4de099f51641 (diff) | |
| download | FreeBSD-src-4579a954ade046fd3ad0427b6b21347f063751d3.zip FreeBSD-src-4579a954ade046fd3ad0427b6b21347f063751d3.tar.gz | |
Oops, fptrint_t still needs to be declared in <machine/profile.h> in the
!KERNEL case. The kludge to get it declared in libc/gmon/mcount.c wasn't
sufficient because fptrint_t is used in <sys/gmon.h>.
| -rw-r--r-- | lib/libc/gmon/mcount.c | 10 | ||||
| -rw-r--r-- | sys/amd64/include/profile.h | 7 | ||||
| -rw-r--r-- | sys/i386/include/profile.h | 7 |
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c index aa8f552..74aaf7d 100644 --- a/lib/libc/gmon/mcount.c +++ b/lib/libc/gmon/mcount.c @@ -36,20 +36,12 @@ static char sccsid[] = "@(#)mcount.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id: mcount.c,v 1.10 1998/03/09 04:42:19 jb Exp $"; + "$Id: mcount.c,v 1.11 1998/07/10 02:27:16 bde Exp $"; #endif #ifndef __NETBSD_SYSCALLS -#ifdef KERNEL -#include <sys/param.h> -#else -/* Kludge to get fptrint_t declared. */ -#define KERNEL #include <sys/param.h> -#undef KERNEL -#endif - #include <sys/gmon.h> #ifdef KERNEL #include <sys/systm.h> diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h index e3da51a..23595b2 100644 --- a/sys/amd64/include/profile.h +++ b/sys/amd64/include/profile.h @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.14 1998/02/03 20:32:38 bde Exp $ + * $Id: profile.h,v 1.15 1998/07/10 02:27:15 bde Exp $ */ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ #ifdef KERNEL + /* * Config generates something to tell the compiler to align functions on 16 * byte boundaries. A strict alignment is good for keeping the tables small. @@ -101,6 +102,10 @@ mcount() \ frompc = ((fptrint_t *)frompc)[1]; \ _mcount(frompc, selfpc); \ } + +/* An unsigned integral type that can hold function pointers. */ +typedef u_int32_t fptrint_t; + #endif /* KERNEL */ /* diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h index e3da51a..23595b2 100644 --- a/sys/i386/include/profile.h +++ b/sys/i386/include/profile.h @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $Id: profile.h,v 1.14 1998/02/03 20:32:38 bde Exp $ + * $Id: profile.h,v 1.15 1998/07/10 02:27:15 bde Exp $ */ #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ #ifdef KERNEL + /* * Config generates something to tell the compiler to align functions on 16 * byte boundaries. A strict alignment is good for keeping the tables small. @@ -101,6 +102,10 @@ mcount() \ frompc = ((fptrint_t *)frompc)[1]; \ _mcount(frompc, selfpc); \ } + +/* An unsigned integral type that can hold function pointers. */ +typedef u_int32_t fptrint_t; + #endif /* KERNEL */ /* |
