* charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid

shadowing.
* charset.c (map_charset_for_dump, Fchar_charset): Likewise.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e3b3c8c2566..ec7322cfe43 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,5 @@
 2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
 
-2011-03-08  Paul Eggert  <eggert@cs.ucla.edu>
-
         * xmenu.c (menu_highlight_callback): Now static.
         (set_frame_menubar): Remove unused local.
         (xmenu_show): Rename parameter to avoid shadowing.
@@ -30,6 +28,10 @@
         * window.h (check_all_windows): New decl, to forestall
         gcc -Wmissing-prototypes diagnostic.
 
+        * charset.h (CHECK_CHARSET_GET_CHARSET): Rename locals to avoid
+        shadowing.
+        * charset.c (map_charset_for_dump, Fchar_charset): Likewise.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (redisplay_window): Revert incorrect logic in 2011-03-06