Merge GDB 7.5.1

gdb/breakpoint.h

 /* Data structures associated with breakpoints in GDB.
    Copyright (C) 1992-2004, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (BREAKPOINT_H)
 #define BREAKPOINT_H 1
 
 #include "frame.h"
 #include "value.h"
 #include "vec.h"
+#include "ax.h"
+#include "command.h"
 
 struct value;
 struct block;
 struct breakpoint_object;
 struct get_number_or_range_state;
 struct thread_info;
 struct bpstats;
 struct bp_location;
+struct linespec_result;
+struct linespec_sals;
 
 /* This is the maximum number of bytes a breakpoint instruction can
    take.  Feel free to increase it.  It's just used in a few places to
    size arrays that should be independent of the target
    architecture.  */
 
 #define BREAKPOINT_MAX  16
 
 
 
 /* Type of breakpoint.  */
 /* FIXME In the future, we should fold all other breakpoint-like
    things into here.  This includes:
 
    * single-step (for machines where we have to simulate single
    stepping) (probably, though perhaps it is better for it to look as
    much as possible like a single-step to wait_for_inferior).  */
 
 enum bptype
   {
     bp_none = 0,                /* Eventpoint has been deleted */
     bp_breakpoint,              /* Normal breakpoint */
     bp_hardware_breakpoint,     /* Hardware assisted breakpoint */
     bp_until,                   /* used by until command */
     bp_finish,                  /* used by finish command */
     bp_watchpoint,              /* Watchpoint */
     bp_hardware_watchpoint,     /* Hardware assisted watchpoint */
     bp_read_watchpoint,         /* read watchpoint, (hardware assisted) */