[commit] Fix compilation --without-expat [Re: [commit] [patch] Implement qXfer:libraries-svr4 for Linux/gdbserver #4]

Jan Kratochvil
2011-12-03T18:34:01Z

On Sat, 03 Dec 2011 18:03:26 +0100, Doug Evans wrote:
> I happened to do a non-expat build and got a build failure.
>
> ../../../src/gdb/solib-svr4.c:1293: error: 'svr4_free_library_list' undeclared (first use in this function)

Checked in.

Sorry,
Jan

http://sourceware.org/ml/gdb-cvs/2011-12/msg00019.html

--- src/gdb/ChangeLog 2011/12/02 22:26:50 1.13569
+++ src/gdb/ChangeLog 2011/12/03 18:32:28 1.13570
@@ -1,3 +1,10 @@
+2011-12-03 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ 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 <ppluzhnikov@google.com>
Jan Kratochvil <jan.kratochvil@redhat.com>

--- src/gdb/solib-svr4.c 2011/12/02 22:26:51 1.159
+++ src/gdb/solib-svr4.c 2011/12/03 18:32:29 1.160
@@ -961,6 +961,30 @@
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 @@
{ 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