From f7efc967ba45350b688e0f661a31eecc15d5e052 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 4 Sep 2017 19:34:48 -0700
Subject: [PATCH] Make <sys/user.h> include in bsd-kvm.c conditional on
 HAVE_SYS_USER_H.

NetBSD has recently removed <sys/user.h>.

gdb/ChangeLog:

	* bsd-kvm.c: Make <sys/user.h> conditional on HAVE_SYS_USER_H.
---
 gdb/ChangeLog | 4 ++++
 gdb/bsd-kvm.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0d86e47..ed89fbc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2017-09-04  John Baldwin  <jhb@FreeBSD.org>
 
+	* bsd-kvm.o: Make <sys/user.h> conditional on HAVE_SYS_USER_H.
+
+2017-09-04  John Baldwin  <jhb@FreeBSD.org>
+
 	* bsd-kvm.o: Define _KMEMUSER.
 	* configure.ac: Define _KMEMUSER when checking for "struct lwp".
 	* configure: Regenerate.
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 8c21394..04e5622 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -37,7 +37,9 @@
 #include "readline/readline.h"
 #include <sys/param.h>
 #include <sys/proc.h>
+#ifdef HAVE_SYS_USER_H
 #include <sys/user.h>
+#endif
 
 #include "bsd-kvm.h"
 
-- 
2.7.4