This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[OBV] Fix compilation failure in solib-svr4.c after my last patch.
- From: "Pierre Muller" <pierre dot muller at ics-cnrs dot unistra dot fr>
- To: <gdb-patches at sourceware dot org>
- Date: Tue, 19 Apr 2011 14:33:13 +0200
- Subject: [OBV] Fix compilation failure in solib-svr4.c after my last patch.
My last ARI fix sadly introduced a
compilation failure in solib-svr4.c
I didn't try to compile this because I, wrongly,
believed it to be a native only source.
The ARI patch renamed LM_NAME to lm_name
The problem is that lm_name is also a local variable
Sorry for the error,
checked in as obvious.
Pierre Muller
2011-04-19 Pierre Muller <muller@ics.u-strasbg.fr>
* solib-svr4.c (svr4_keep_data_in_core): Rename local variable
lm_name to name_lm to avoid conflict with lm_name function.
Index: solib-svr4.c
===================================================================
RCS file: /cvs/src/src/gdb/solib-svr4.c,v
retrieving revision 1.147
diff -u -p -r1.147 solib-svr4.c
--- solib-svr4.c 19 Apr 2011 11:38:40 -0000 1.147
+++ solib-svr4.c 19 Apr 2011 12:28:59 -0000
@@ -954,7 +954,7 @@ svr4_keep_data_in_core (CORE_ADDR vaddr,
struct so_list *new;
struct cleanup *old_chain;
struct link_map_offsets *lmo;
- CORE_ADDR lm_name;
+ CORE_ADDR name_lm;
info = get_svr4_info ();
@@ -977,10 +977,10 @@ svr4_keep_data_in_core (CORE_ADDR vaddr,
new->lm_info->lm = xzalloc (lmo->link_map_size);
make_cleanup (xfree, new->lm_info->lm);
read_memory (ldsomap, new->lm_info->lm, lmo->link_map_size);
- lm_name = lm_name (new);
+ name_lm = lm_name (new);
do_cleanups (old_chain);
- return (lm_name >= vaddr && lm_name < vaddr + size);
+ return (name_lm >= vaddr && name_lm < vaddr + size);
}
/*