Use ui_file_as_string in gdbarch.sh/gdbarch.c

[deliverable/binutils-gdb.git] / gdb / s390-linux-nat.c

diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index d1d2bf8e37e7643073832bdafb24045a1ca5bcf6..9abb5c23471d2c00964cebdf1e0d72a22880936a 100644 (file)
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -39,6 +39,7 @@
 #include <sys/procfs.h>
 #include <sys/ucontext.h>
 #include <elf.h>
+#include <algorithm>
 
 /* Per-thread arch-specific data.  */
 
@@ -700,8 +701,8 @@ s390_prepare_to_resume (struct lwp_info *lp)
           VEC_iterate (s390_watch_area, state->watch_areas, ix, area);
           ix++)
        {
-         watch_lo_addr = min (watch_lo_addr, area->lo_addr);
-         watch_hi_addr = max (watch_hi_addr, area->hi_addr);
+         watch_lo_addr = std::min (watch_lo_addr, area->lo_addr);
+         watch_hi_addr = std::max (watch_hi_addr, area->hi_addr);
        }
 
       /* Enable storage-alteration events.  */
@@ -722,8 +723,8 @@ s390_prepare_to_resume (struct lwp_info *lp)
               VEC_iterate (s390_watch_area, state->break_areas, ix, area);
               ix++)
            {
-             watch_lo_addr = min (watch_lo_addr, area->lo_addr);
-             watch_hi_addr = max (watch_hi_addr, area->hi_addr);
+             watch_lo_addr = std::min (watch_lo_addr, area->lo_addr);
+             watch_hi_addr = std::max (watch_hi_addr, area->hi_addr);
            }
 
          /* If there's just one breakpoint, enable instruction-fetching