Merge GDB 7.5.1

gdb/python/py-infthread.c

 /* Python interface to inferior threads.
 
    Copyright (C) 2009-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 144 matching lines @@
 
   return ret;
 }
 
 /* Implementation of InferiorThread.switch ().
    Makes this the GDB selected thread.  */
 static PyObject *
 thpy_switch (PyObject *self, PyObject *args)
 {
   thread_object *thread_obj = (thread_object *) self;
-  struct cleanup *cleanup;
   volatile struct gdb_exception except;
 
   THPY_REQUIRE_VALID (thread_obj);
 
   TRY_CATCH (except, RETURN_MASK_ALL)
     {
       switch_to_thread (thread_obj->thread->ptid);
     }
   GDB_PY_HANDLE_EXCEPTION (except);
 
@@ skipping 158 matching lines @@
   0,                              /* tp_members */
   thread_object_getset,           /* tp_getset */
   0,                              /* tp_base */
   0,                              /* tp_dict */
   0,                              /* tp_descr_get */
   0,                              /* tp_descr_set */
   0,                              /* tp_dictoffset */
   0,                              /* tp_init */
   0                               /* tp_alloc */
 };