Merge GDB 7.5.1

gdb/macrocmd.c

Index: gdb/macrocmd.c
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index 367f211d06b7b58fcf5c6837ccc761f4060c34b3..a327cade4c9e4d1c7e01d306a1be952d58f8deca 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -26,6 +26,7 @@
 #include "command.h"
 #include "gdbcmd.h"
 #include "gdb_string.h"
+#include "linespec.h"
 
 
 /* The `macro' prefix command.  */
@@ -282,7 +283,8 @@ info_macros_command (char *args, int from_tty)
     ms = default_macro_scope ();
   else
     {
-      struct symtabs_and_lines sals = decode_line_spec (args, 0);
+      struct symtabs_and_lines sals =
+	decode_line_with_current_source (args, 0);
 
       if (sals.nelts)
         ms = sal_macro_scope (sals.sals[0]);