Fix argument to compiled_cond, and add cases for compiled-condition.

[deliverable/binutils-gdb.git] / gdb / memory-map.c

diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 5e61ca5722906d7589e91a7aa17e215c87e7b506..77eb93e781b5e834e97571e650d8414ee485de59 100644 (file)
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -1,7 +1,6 @@
 /* Routines for handling XML memory maps provided by target.
 
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,10 +19,6 @@
 
 #include "defs.h"
 #include "memory-map.h"
-#include "gdb_assert.h"
-#include "exceptions.h"
-
-#include "gdb_string.h"
 
 #if !defined(HAVE_LIBEXPAT)
 
@@ -71,7 +66,7 @@ memory_map_start_memory (struct gdb_xml_parser *parser,
   mem_region_init (r);
   r->lo = *start_p;
   r->hi = r->lo + *length_p;
-  r->attrib.mode = *type_p;
+  r->attrib.mode = (enum mem_access_mode) *type_p;
   r->attrib.blocksize = -1;
 }