Merge GDB 7.5.1

gdb/python/py-cmd.c

 /* gdb commands implemented in Python
 
    Copyright (C) 2008-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.
@@ skipping 17 matching lines @@
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "language.h"
 
 /* Struct representing built-in completion types.  */
 struct cmdpy_completer
 {
   /* Python symbol name.  */
   char *name;
   /* Completion function.  */
-  char **(*completer) (struct cmd_list_element *, char *, char *);
+  completer_ftype *completer;
 };
 
 static struct cmdpy_completer completers[] =
 {
   { "COMPLETE_NONE", noop_completer },
   { "COMPLETE_FILENAME", filename_completer },
   { "COMPLETE_LOCATION", location_completer },
   { "COMPLETE_COMMAND", command_completer },
   { "COMPLETE_SYMBOL", make_symbol_completion_list_fn },
 };
@@ skipping 147 matching lines @@
       else
         {
           Py_XDECREF (ptype);
           Py_XDECREF (pvalue);
           Py_XDECREF (ptraceback);
           error ("%s", msg);
         }
     }
 
   Py_DECREF (result);