From 202339d49461ce6dcffd3a5b3690537daea5ef38 Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Wed, 1 May 2013 21:10:34 -0400
Subject: 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.
---
 Makeconf       | 2 +-
 utils/Makefile | 2 ++
 utils/vmstat.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makeconf b/Makeconf
index c72287a5..a3c584fc 100644
--- a/Makeconf
+++ b/Makeconf
@@ -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>
-- 
cgit v1.2.3