Merge GDB 7.5.1

gdb/python/py-lazy-string.c

 /* Python interface to lazy strings.
 
    Copyright (C) 2010-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 66 matching lines @@
 }
 
 static PyObject *
 stpy_get_length (PyObject *self, void *closure)
 {
   lazy_string_object *self_string = (lazy_string_object *) self;
 
   return PyLong_FromLong (self_string->length);
 }
 
-PyObject *
+static PyObject *
 stpy_get_type (PyObject *self, void *closure)
 {
   lazy_string_object *str_obj = (lazy_string_object *) self;
 
   return type_to_type_object (str_obj->type);
 }
 
 static PyObject *
 stpy_convert_to_value  (PyObject *self, PyObject *args)
 {
@@ skipping 144 matching lines @@
   0,                              /* tp_traverse */
   0,                              /* tp_clear */
   0,                              /* tp_richcompare */
   0,                              /* tp_weaklistoffset */
   0,                              /* tp_iter */
   0,                              /* tp_iternext */
   lazy_string_object_methods,     /* tp_methods */
   0,                              /* tp_members */
   lazy_string_object_getset       /* tp_getset */
 };