From ca7b0bbcfaa938faffc6cfe2ece880b5d0fecdf2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 18 Dec 2012 19:26:29 +0000 Subject: [PATCH] * Makefile.in (init.c): Declare initialize_all_files; don't include call-cmds.h. * call-cmds.h: Remove. * symtab.c: Don't include call-cmds.h. * top.c: Don't include call-cmds.h. Declare initialize_all_files. --- gdb/ChangeLog | 9 +++++++++ gdb/Makefile.in | 2 +- gdb/call-cmds.h | 34 ---------------------------------- gdb/symtab.c | 1 - gdb/top.c | 3 ++- 5 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 gdb/call-cmds.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ef1dcabfcc..02dc9443f3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2012-12-12 Tom Tromey + + * Makefile.in (init.c): Declare initialize_all_files; + don't include call-cmds.h. + * call-cmds.h: Remove. + * symtab.c: Don't include call-cmds.h. + * top.c: Don't include call-cmds.h. Declare + initialize_all_files. + 2012-12-12 Tom Tromey * symfile.c (list_overlays_command, map_overlay_command) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 194568b9a4..5ded1a599a 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1140,7 +1140,7 @@ init.c: $(INIT_FILES) @echo '/* Do not modify this file. */' >>init.c-tmp @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp @echo '#include "defs.h" /* For initialize_file_ftype. */' >>init.c-tmp - @echo '#include "call-cmds.h" /* For initialize_all_files. */' >>init.c-tmp + @echo 'extern void initialize_all_files(void);' >>init.c-tmp @sed -e 's/\(.*\)/extern initialize_file_ftype _initialize_\1;/' >init.c-tmp @echo 'void' >>init.c-tmp @echo 'initialize_all_files (void)' >>init.c-tmp diff --git a/gdb/call-cmds.h b/gdb/call-cmds.h deleted file mode 100644 index e98585b950..0000000000 --- a/gdb/call-cmds.h +++ /dev/null @@ -1,34 +0,0 @@ -/* ***DEPRECATED*** The gdblib files must not be calling/using things in any - of the possible command languages. If necessary, a hook (that may be - present or not) must be used and set to the appropriate routine by any - command language that cares about it. If you are having to include this - file you are possibly doing things the old way. This file will disapear. - 2000-12-01 fnasser@redhat.com */ - -/* Prototypes for GDB commands that are called internally by other functions. - Copyright (C) 1992, 2000-2001, 2007-2012 Free Software Foundation, - Inc. - - 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 . */ - -#ifndef CALL_CMDS_H -#define CALL_CMDS_H - -extern void initialize_all_files (void); - -extern void core_file_command (char *, int); - -extern void break_command (char *, int); - -#endif diff --git a/gdb/symtab.c b/gdb/symtab.c index 0fd75e53c8..7c06b41509 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -27,7 +27,6 @@ #include "symfile.h" #include "objfiles.h" #include "gdbcmd.h" -#include "call-cmds.h" #include "gdb_regex.h" #include "expression.h" #include "language.h" diff --git a/gdb/top.c b/gdb/top.c index f3561e5270..bdd625ccf9 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -19,7 +19,6 @@ #include "defs.h" #include "gdbcmd.h" -#include "call-cmds.h" #include "cli/cli-cmds.h" #include "cli/cli-script.h" #include "cli/cli-setshow.h" @@ -65,6 +64,8 @@ #include "ui-out.h" #include "cli-out.h" +extern void initialize_all_files (void); + #define PROMPT(X) the_prompts.prompt_stack[the_prompts.top + X].prompt #define PREFIX(X) the_prompts.prompt_stack[the_prompts.top + X].prefix #define SUFFIX(X) the_prompts.prompt_stack[the_prompts.top + X].suffix