diff options
| author | David Michael <fedora.dm0@gmail.com> | 2013-05-01 21:10:34 -0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-05-05 23:30:47 +0200 |
| commit | 202339d49461ce6dcffd3a5b3690537daea5ef38 (patch) | |
| tree | fad92f006c8f380a01a847788e72805da60b2dfb | |
| parent | b6fe0d45cf69841f631b0e3991c6a0a7d9b4c9df (diff) | |
utils/vmstat: Use gnumach.defs from gnumach
The gnumach installation provides the include file mach/gnumach.defs
instead of mach/gnumach.h. This runs the defs file through MIG and
builds the result for vmstat.
* utils/vmstat.c: Replace <mach/gnumach.h> with "gnumach_U.h".
* utils/Makefile (vmstat): Add rule to depend on gnumach_U.o.
* Makeconf (mach_defs_names): Add gnumach.
| -rw-r--r-- | Makeconf | 2 | ||||
| -rw-r--r-- | utils/Makefile | 2 | ||||
| -rw-r--r-- | utils/vmstat.c | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -573,7 +573,7 @@ $(mig-sheader-prefix)%_S.h %Server.c: %.sdefsi vpath %.defs $(top_srcdir)/hurd # These we want to find in the libc include directory... -mach_defs_names = bootstrap exc mach mach4 \ +mach_defs_names = bootstrap exc gnumach mach mach4 \ mach_host mach_port mach_timer_reply memory_object \ memory_object_default notify device_defs_names = dev_forward device device_reply device_request diff --git a/utils/Makefile b/utils/Makefile index e3bed0bf..e2388f5c 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -61,6 +61,8 @@ ps w ids settrans syncfs showtrans fsysopts storeinfo login vmstat portinfo \ $(filter-out $(special-targets), $(targets)): %: %.o +vmstat: gnumachUser.o + rpctrace: ../libports/libports.a ../libihash/libihash.a rpctrace-CPPFLAGS = -DDATADIR=\"${datadir}\" diff --git a/utils/vmstat.c b/utils/vmstat.c index e3944848..90d128ff 100644 --- a/utils/vmstat.c +++ b/utils/vmstat.c @@ -27,8 +27,8 @@ #include <fcntl.h> #include <version.h> +#include "gnumach_U.h" #include <mach.h> -#include <mach/gnumach.h> #include <mach/vm_statistics.h> #include <mach/vm_cache_statistics.h> #include <mach/default_pager.h> |