* gnu-v2-abi.c: Don't include gnu-v2-abi.h.

	(gnuv2_baseclass_offset): Now static.
	* Makefile.in (HFILES_NO_SRCDIR): Remove gnu-v2-abi.h.
	* gnu-v2-abi.h: Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ebad2c..f743cd2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2010-02-02  Tom Tromey  <tromey@redhat.com>
 
+       * gnu-v2-abi.c: Don't include gnu-v2-abi.h.
+       (gnuv2_baseclass_offset): Now static.
+       * Makefile.in (HFILES_NO_SRCDIR): Remove gnu-v2-abi.h.
+       * gnu-v2-abi.h: Remove.
+
+2010-02-02  Tom Tromey  <tromey@redhat.com>
+
        * m2-typeprint.c (m2_record_fields): Don't use
        TYPE_DECLARED_TYPE.
        * gdbtypes.h (TYPE_DECLARED_CLASS): New macro.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index ff8b86e..98f42b9 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -706,7 +706,7 @@ osf-share/cma_errors.h osf-share/cma_tcb_defs.h osf-share/cma_attr.h \
 osf-share/cma_stack_int.h osf-share/cma_init.h \
 osf-share/cma_deb_core.h osf-share/AT386/cma_thread_io.h \
 osf-share/cma_sched.h proc-utils.h arm-tdep.h ax-gdb.h ppcnbsd-tdep.h \
-cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h gnu-v2-abi.h \
+cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \
 exec.h m32r-tdep.h osabi.h gdbcore.h solib-som.h \
 i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
 ia64-tdep.h ada-lang.h varobj.h frv-tdep.h nto-tdep.h serial.h \

diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index cfca913..8931be2 100644 (file)
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -28,7 +28,6 @@
 #include "demangle.h"
 #include "cp-abi.h"
 #include "cp-support.h"
-#include "gnu-v2-abi.h"
 
 #include <ctype.h>
 
@@ -346,7 +345,7 @@ vb_match (struct type *type, int index, struct type *basetype)
 
    -1 is returned on error. */
 
-int
+static int
 gnuv2_baseclass_offset (struct type *type, int index,
                        const bfd_byte *valaddr, CORE_ADDR address)
 {

diff --git a/gdb/gnu-v2-abi.h b/gdb/gnu-v2-abi.h
deleted file mode 100644 (file)
index e1911b6..0000000
--- a/gdb/gnu-v2-abi.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Abstraction of GNU v2 abi.
-
-   Copyright (C) 2005, 2007, 2008, 2009, 2010 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.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   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, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef GNU_V2_ABI_H
-#define GNU_V2_ABI_H
-
-extern int gnuv2_baseclass_offset (struct type *type, int index,
-                                  const bfd_byte *valaddr,
-                                  CORE_ADDR address);
-
-#endif