diff options
| author | Christian Biesinger <cbiesinger@google.com> | 2019-10-07 17:38:51 -0500 |
|---|---|---|
| committer | Christian Biesinger <cbiesinger@google.com> | 2019-10-09 13:18:47 -0500 |
| commit | 6a25e8a290eb5453d1464f68889c9c9a1084191a (patch) | |
| tree | d3a1dddce41ebad50186d29529e863e11a49d9f3 | |
| parent | 1d3787499d6edd07b30f3fc7b26962a1c695b8a4 (diff) | |
| download | gdb-6a25e8a290eb5453d1464f68889c9c9a1084191a.zip gdb-6a25e8a290eb5453d1464f68889c9c9a1084191a.tar.gz gdb-6a25e8a290eb5453d1464f68889c9c9a1084191a.tar.bz2 | |
Mark guile_{extension_,}script_ops as static
This makes it clearer that the structs are only used in this file. It
required moving the definition of extension_language_guile further
down in the file, because static structs can't be forward-declared.
gdb/ChangeLog:
2019-10-09 Christian Biesinger <cbiesinger@google.com>
* guile/guile.c (guile_extension_script_ops): Remove forward
declaration and mark as static.
(guile_script_ops): Likewise.
(extension_language_guile): Move further down in the file so
it can reference the definitions for guile_{extension_,}script_ops.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/guile/guile.c | 55 |
2 files changed, 34 insertions, 29 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 35614cc..2a39ab2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-10-09 Christian Biesinger <cbiesinger@google.com> + + * guile/guile.c (guile_extension_script_ops): Remove forward + declaration and mark as static. + (guile_script_ops): Likewise. + (extension_language_guile): Move further down in the file so + it can reference the definitions for guile_{extension_,}script_ops. + 2019-10-09 Andreas Arnez <arnez@linux.ibm.com> * s390-tdep.c (390_process_record): Handle new arch13 instructions diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c index defe554..55929f4 100644 --- a/gdb/guile/guile.c +++ b/gdb/guile/guile.c @@ -71,33 +71,6 @@ static const char *const guile_print_excp_enums[] = the default. */ const char *gdbscm_print_excp = gdbscm_print_excp_message; -#ifdef HAVE_GUILE -/* Forward decls, these are defined later. */ -extern const struct extension_language_script_ops guile_extension_script_ops; -extern const struct extension_language_ops guile_extension_ops; -#endif - -/* The main struct describing GDB's interface to the Guile - extension language. */ -extern const struct extension_language_defn extension_language_guile = -{ - EXT_LANG_GUILE, - "guile", - "Guile", - - ".scm", - "-gdb.scm", - - guile_control, - -#ifdef HAVE_GUILE - &guile_extension_script_ops, - &guile_extension_ops -#else - NULL, - NULL -#endif -}; #ifdef HAVE_GUILE @@ -126,7 +99,7 @@ static const char boot_scm_filename[] = "boot.scm"; /* The interface between gdb proper and loading of python scripts. */ -const struct extension_language_script_ops guile_extension_script_ops = +static const struct extension_language_script_ops guile_extension_script_ops = { gdbscm_source_script, gdbscm_source_objfile_script, @@ -136,7 +109,7 @@ const struct extension_language_script_ops guile_extension_script_ops = /* The interface between gdb proper and guile scripting. */ -const struct extension_language_ops guile_extension_ops = +static const struct extension_language_ops guile_extension_ops = { gdbscm_finish_initialization, gdbscm_initialized, @@ -159,7 +132,31 @@ const struct extension_language_ops guile_extension_ops = NULL, /* gdbscm_check_quit_flag, */ NULL, /* gdbscm_set_quit_flag, */ }; +#endif + +/* The main struct describing GDB's interface to the Guile + extension language. */ +extern const struct extension_language_defn extension_language_guile = +{ + EXT_LANG_GUILE, + "guile", + "Guile", + + ".scm", + "-gdb.scm", + guile_control, + +#ifdef HAVE_GUILE + &guile_extension_script_ops, + &guile_extension_ops +#else + NULL, + NULL +#endif +}; + +#ifdef HAVE_GUILE /* Implementation of the gdb "guile-repl" command. */ static void |