aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/fbsd-nat.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 55a0b12..aa2a48e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-09 John Baldwin <jhb@FreeBSD.org>
+
+ * fbsd-nat.c: [!HAVE_KINFO_GETVMMAP]: Include <sys/user.h> and
+ "filestuff.h".
+ (fbsd_find_memory_regions): Fix `mapfile' initialization.
+
2017-08-09 Tom Tromey <tom@tromey.com>
* skip.c (skiplist_entry): New constructor.
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 833f460..3d3aa3d 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -30,9 +30,11 @@
#include <sys/ptrace.h>
#include <sys/signal.h>
#include <sys/sysctl.h>
-#ifdef HAVE_KINFO_GETVMMAP
#include <sys/user.h>
+#ifdef HAVE_KINFO_GETVMMAP
#include <libutil.h>
+#else
+#include "filestuff.h"
#endif
#include "elf-bfd.h"
@@ -168,7 +170,7 @@ fbsd_find_memory_regions (struct target_ops *self,
mapfilename = xstrprintf ("/proc/%ld/map", (long) pid);
cleanup = make_cleanup (xfree, mapfilename);
- gdb_file_up mapfile = fopen (mapfilename, "r");
+ gdb_file_up mapfile (fopen (mapfilename, "r"));
if (mapfile == NULL)
error (_("Couldn't open %s."), mapfilename);