From 72e0248351fdc4ab125a16af24df031bca2275e4 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 7 Sep 2015 19:34:31 +0100 Subject: guile: Add as_a_scm_t_subr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Building GDB in C++ mode on Fedora 20, the gdb/guile/ code shows ~280 errors like: src/gdb/guile/guile.c:515:1: error: invalid conversion from ‘scm_unused_struct* (*)(SCM, SCM) {aka scm_unused_struct* (*)(scm_unused_struct*, scm_unused_struct*)}’ to ‘scm_t_subr {aka void*}’ [-fpermissive] This commit fixes them all. gdb/ChangeLog: 2015-09-07 Pedro Alves * guile/guile-internal.h (as_a_scm_t_subr): New. * guile/guile.c (misc_guile_functions): Use it. * guile/scm-arch.c (arch_functions): Use it. * guile/scm-block.c (block_functions, gdbscm_initialize_blocks): Use it. * guile/scm-breakpoint.c (breakpoint_functions): Use it. * guile/scm-cmd.c (command_functions): Use it. * guile/scm-disasm.c (disasm_functions): Use it. * guile/scm-exception.c (exception_functions) (private_exception_functions): Use it. * guile/scm-frame.c (frame_functions) * guile/scm-gsmob.c (gsmob_functions): Use it. * guile/scm-iterator.c (iterator_functions): Use it. * guile/scm-lazy-string.c (lazy_string_functions): Use it. * guile/scm-math.c (math_functions): Use it. * guile/scm-objfile.c (objfile_functions): Use it. * guile/scm-param.c (parameter_functions): Use it. * guile/scm-ports.c (port_functions, private_port_functions): Use it. * guile/scm-pretty-print.c (pretty_printer_functions): Use it. * guile/scm-progspace.c (pspace_functions): Use it. * guile/scm-string.c (string_functions): Use it. * guile/scm-symbol.c (symbol_functions): Use it. * guile/scm-symtab.c (symtab_functions): Use it. * guile/scm-type.c (type_functions, gdbscm_initialize_types): Use it. * guile/scm-value.c (value_functions): Use it. --- gdb/guile/scm-progspace.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gdb/guile/scm-progspace.c') diff --git a/gdb/guile/scm-progspace.c b/gdb/guile/scm-progspace.c index ec68d22..a95e834 100644 --- a/gdb/guile/scm-progspace.c +++ b/gdb/guile/scm-progspace.c @@ -373,38 +373,39 @@ gdbscm_progspaces (void) static const scheme_function pspace_functions[] = { - { "progspace?", 1, 0, 0, gdbscm_progspace_p, + { "progspace?", 1, 0, 0, as_a_scm_t_subr (gdbscm_progspace_p), "\ Return #t if the object is a object." }, - { "progspace-valid?", 1, 0, 0, gdbscm_progspace_valid_p, + { "progspace-valid?", 1, 0, 0, as_a_scm_t_subr (gdbscm_progspace_valid_p), "\ Return #t if the progspace is valid (hasn't been deleted from gdb)." }, - { "progspace-filename", 1, 0, 0, gdbscm_progspace_filename, + { "progspace-filename", 1, 0, 0, as_a_scm_t_subr (gdbscm_progspace_filename), "\ Return the name of the main symbol file of the progspace." }, - { "progspace-objfiles", 1, 0, 0, gdbscm_progspace_objfiles, + { "progspace-objfiles", 1, 0, 0, as_a_scm_t_subr (gdbscm_progspace_objfiles), "\ Return the list of objfiles associated with the progspace.\n\ Objfiles that are separate debug objfiles are not included in the result.\n\ The order of appearance of objfiles in the result is arbitrary." }, - { "progspace-pretty-printers", 1, 0, 0, gdbscm_progspace_pretty_printers, + { "progspace-pretty-printers", 1, 0, 0, + as_a_scm_t_subr (gdbscm_progspace_pretty_printers), "\ Return a list of pretty-printers of the progspace." }, { "set-progspace-pretty-printers!", 2, 0, 0, - gdbscm_set_progspace_pretty_printers_x, + as_a_scm_t_subr (gdbscm_set_progspace_pretty_printers_x), "\ Set the list of pretty-printers of the progspace." }, - { "current-progspace", 0, 0, 0, gdbscm_current_progspace, + { "current-progspace", 0, 0, 0, as_a_scm_t_subr (gdbscm_current_progspace), "\ Return the current program space if there is one or #f if there isn't one." }, - { "progspaces", 0, 0, 0, gdbscm_progspaces, + { "progspaces", 0, 0, 0, as_a_scm_t_subr (gdbscm_progspaces), "\ Return a list of all program spaces." }, -- cgit v1.1