Record GDB 6.7 branch creation. Bump version number to 6.7.50-20070911-cvs.

[deliverable/binutils-gdb.git] / gdb / cp-abi.c

diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index 7bc15525977dd39a504675dfbff05c662cc222d6..9d5d60c671d251ca60980ffbaaf8e7762963a814 100644 (file)
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -7,7 +7,7 @@
 
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "value.h"
@@ -122,11 +120,11 @@ cplus_make_method_ptr (gdb_byte *contents, CORE_ADDR value, int is_virtual)
 }
 
 CORE_ADDR
-cplus_skip_trampoline (CORE_ADDR stop_pc)
+cplus_skip_trampoline (struct frame_info *frame, CORE_ADDR stop_pc)
 {
   if (current_cp_abi.skip_trampoline == NULL)
     return 0;
-  return (*current_cp_abi.skip_trampoline) (stop_pc);
+  return (*current_cp_abi.skip_trampoline) (frame, stop_pc);
 }
 
 struct value *