* solib-svr4.c (svr4_keep_data_in_core): Rename local variable

	lm_name to name_lm to avoid conflict with lm_name function.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cab3c8411725ca18fae011cda3c37054e6a6e310..b758a7164424a542ebf4d462cef76fab2676e566 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2011-04-19  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        ARI fixes: Use only lowercase function name for static functions.

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 23d44a695b1e896d2ebca706725395767129602d..7e2e39c2d09022073ff50d0fc9d14a5f06899d0b 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -954,7 +954,7 @@ svr4_keep_data_in_core (CORE_ADDR vaddr, unsigned long size)
   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, unsigned long size)
   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);
 }
 
 /*