From 93f2a35e101e29e80f48ef9103a1aafb7ec2036e Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 3 Dec 2011 18:32:29 +0000 Subject: [PATCH] gdb/ Fix compilation --without-expat. * solib-svr4.c (svr4_free_so, svr4_free_library_list): Move them here from ... [HAVE_LIBEXPAT] (svr4_free_so, svr4_free_library_list): ... here. --- gdb/ChangeLog | 7 +++++++ gdb/solib-svr4.c | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5673a56..256353c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-12-03 Jan Kratochvil + + Fix compilation --without-expat. + * solib-svr4.c (svr4_free_so, svr4_free_library_list): Move them here + from ... + [HAVE_LIBEXPAT] (svr4_free_so, svr4_free_library_list): ... here. + 2011-12-02 Paul Pluzhnikov Jan Kratochvil diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 9be582c..83d7904 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -961,6 +961,30 @@ struct svr4_library_list CORE_ADDR main_lm; }; +/* Implementation for target_so_ops.free_so. */ + +static void +svr4_free_so (struct so_list *so) +{ + xfree (so->lm_info); +} + +/* Free so_list built so far (called via cleanup). */ + +static void +svr4_free_library_list (void *p_list) +{ + struct so_list *list = *(struct so_list **) p_list; + + while (list != NULL) + { + struct so_list *next = list->next; + + svr4_free_so (list); + list = next; + } +} + #ifdef HAVE_LIBEXPAT #include "xml-support.h" @@ -1050,30 +1074,6 @@ static const struct gdb_xml_element svr4_library_list_elements[] = { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -/* Implementation for target_so_ops.free_so. */ - -static void -svr4_free_so (struct so_list *so) -{ - xfree (so->lm_info); -} - -/* Free so_list built so far (called via cleanup). */ - -static void -svr4_free_library_list (void *p_list) -{ - struct so_list *list = *(struct so_list **) p_list; - - while (list != NULL) - { - struct so_list *next = list->next; - - svr4_free_so (list); - list = next; - } -} - /* Parse qXfer:libraries:read packet into *SO_LIST_RETURN. Return 1 if Return 0 if packet not supported, *SO_LIST_RETURN is not modified in such -- 2.7.4