diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/Makefile.in | 4 | ||||
| -rw-r--r-- | gdb/m2-valprint.c | 11 | ||||
| -rw-r--r-- | gdb/scm-valprint.c | 11 |
4 files changed, 16 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d9bbadf..7dcac84 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2005-01-28 Andrew Cagney <cagney@gnu.org> + * m2-valprint.c: Include "c-lang.h". + (c_val_print): Delete extern declaration. + * scm-valprint.c: Include "c-lang.h". + (c_val_print): Delete extern declaration. + Makefile.in: Update dependencies. + * gnu-v2-abi.h (gnuv2_baseclass_offset): Make "valaddr" a const bfd_byte. * cp-abi.h (baseclass_offset): Make "valaddr" a const bfd_byte. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 5305da5..7c7c2f0 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2163,7 +2163,7 @@ m2-lang.o: m2-lang.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ m2-typeprint.o: m2-typeprint.c $(defs_h) $(bfd_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(value_h) $(gdbcore_h) $(target_h) $(m2_lang_h) m2-valprint.o: m2-valprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) \ - $(m2_lang_h) + $(m2_lang_h) $(c_lang_h) m32r-linux-nat.o: m32r-linux-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(regcache_h) $(linux_nat_h) $(gdb_assert_h) $(gdb_string_h) \ $(gregset_h) $(m32r_tdep_h) @@ -2458,7 +2458,7 @@ scm-lang.o: scm-lang.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ $(scm_tags_h) $(source_h) $(gdb_string_h) $(gdbcore_h) $(infcall_h) scm-valprint.o: scm-valprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(parser_defs_h) $(language_h) $(value_h) \ - $(scm_lang_h) $(valprint_h) $(gdbcore_h) + $(scm_lang_h) $(valprint_h) $(gdbcore_h) $(c_lang_h) sentinel-frame.o: sentinel-frame.c $(defs_h) $(regcache_h) \ $(sentinel_frame_h) $(inferior_h) $(frame_unwind_h) ser-e7kpc.o: ser-e7kpc.c $(defs_h) $(serial_h) $(gdb_string_h) diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c index ec80301..648aba2 100644 --- a/gdb/m2-valprint.c +++ b/gdb/m2-valprint.c @@ -1,6 +1,7 @@ /* Support for printing Modula 2 values for GDB, the GNU debugger. - Copyright 1986, 1988, 1989, 1991, 1992, 1996, 1998, 2000 - Free Software Foundation, Inc. + + Copyright 1986, 1988, 1989, 1991, 1992, 1996, 1998, 2000, 2005 Free + Software Foundation, Inc. This file is part of GDB. @@ -23,17 +24,13 @@ #include "symtab.h" #include "gdbtypes.h" #include "m2-lang.h" - -/* FIXME: For now, just explicitly declare c_val_print and use it instead */ +#include "c-lang.h" int m2_val_print (struct type *type, char *valaddr, int embedded_offset, CORE_ADDR address, struct ui_file *stream, int format, int deref_ref, int recurse, enum val_prettyprint pretty) { - extern int c_val_print (struct type *, char *, int, CORE_ADDR, - struct ui_file *, int, int, int, - enum val_prettyprint); return (c_val_print (type, valaddr, 0, address, stream, format, deref_ref, recurse, pretty)); } diff --git a/gdb/scm-valprint.c b/gdb/scm-valprint.c index 222db92..e796653 100644 --- a/gdb/scm-valprint.c +++ b/gdb/scm-valprint.c @@ -1,6 +1,7 @@ /* Scheme/Guile language support routines for GDB, the GNU debugger. - Copyright 1995, 1996, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + + Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2005 Free Software + Foundation, Inc. This file is part of GDB. @@ -29,11 +30,7 @@ #include "scm-lang.h" #include "valprint.h" #include "gdbcore.h" - -/* FIXME: Should be in a header file that we import. */ -extern int c_val_print (struct type *, char *, int, CORE_ADDR, - struct ui_file *, int, int, int, - enum val_prettyprint); +#include "c-lang.h" static void scm_ipruk (char *, LONGEST, struct ui_file *); static void scm_scmlist_print (LONGEST, struct ui_file *, int, int, |