Merge GDB 7.5.1

gdb/completer.h

Index: gdb/completer.h
diff --git a/gdb/completer.h b/gdb/completer.h
index 0f522459b16751d9e14ba5a5fb9edf345ddb0eb7..680bc2dc1a0fb8da820d6e335f595b1919c7eb50 100644
--- a/gdb/completer.h
+++ b/gdb/completer.h
@@ -17,27 +17,29 @@
 #if !defined (COMPLETER_H)
 #define COMPLETER_H 1
 
-extern char **complete_line (const char *text,
-			     char *line_buffer,
-			     int point);
+#include "gdb_vecs.h"
+
+extern VEC (char_ptr) *complete_line (const char *text,
+				      char *line_buffer,
+				      int point);
 
 extern char *readline_line_completion_function (const char *text,
 						int matches);
 
-extern char **noop_completer (struct cmd_list_element *,
-			      char *, char *);
+extern VEC (char_ptr) *noop_completer (struct cmd_list_element *,
+				       char *, char *);
 
-extern char **filename_completer (struct cmd_list_element *,
-				  char *, char *);
+extern VEC (char_ptr) *filename_completer (struct cmd_list_element *,
+					   char *, char *);
 
-extern char **expression_completer (struct cmd_list_element *,
-				    char *, char *);
+extern VEC (char_ptr) *expression_completer (struct cmd_list_element *,
+					     char *, char *);
 
-extern char **location_completer (struct cmd_list_element *,
-				  char *, char *);
+extern VEC (char_ptr) *location_completer (struct cmd_list_element *,
+					   char *, char *);
 
-extern char **command_completer (struct cmd_list_element *,
-				 char *, char *);
+extern VEC (char_ptr) *command_completer (struct cmd_list_element *,
+					  char *, char *);
 
 extern char *get_gdb_completer_quote_characters (void);