diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2002-01-24 17:58:42 +0000 |
| commit | c48987263d3f55042a1e5d0c5e8411ed21161f2d (patch) | |
| tree | 77ba8c0759d802c8505f8c156c2ba17717d80db5 /contrib/top/machine.h | |
| parent | 37a39754f41e50ca628e970dc78475098d1c10c5 (diff) | |
| download | FreeBSD-src-c48987263d3f55042a1e5d0c5e8411ed21161f2d.zip FreeBSD-src-c48987263d3f55042a1e5d0c5e8411ed21161f2d.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/top/machine.h')
| -rw-r--r-- | contrib/top/machine.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/top/machine.h b/contrib/top/machine.h index 0f14bf3..4f4f6af 100644 --- a/contrib/top/machine.h +++ b/contrib/top/machine.h @@ -1,4 +1,8 @@ /* + * $FreeBSD$ + */ + +/* * This file defines the interface between top and the machine-dependent * module. It is NOT machine dependent and should not need to be changed * for any specific machine. @@ -22,12 +26,18 @@ struct statics * the system_info struct is filled in by a machine dependent routine. */ +#ifdef p_active /* uw7 define macro p_active */ +#define P_ACTIVE p_pactive +#else +#define P_ACTIVE p_active +#endif + struct system_info { int last_pid; double load_avg[NUM_AVERAGES]; int p_total; - int p_active; /* number of procs considered "active" */ + int P_ACTIVE; /* number of procs considered "active" */ int *procstates; int *cpustates; int *memory; |
