2 files changed, 5 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b707c4b463..4b3f0ceca36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-03-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.
+
         * font.c (font_unparse_xlfd): Don't mix pointers to variables with
         pointers to constants.
         (font_parse_fcname): Remove unused vars.
diff --git a/src/character.h b/src/character.h
index f0b0002032e..77c670728d0 100644
--- a/src/character.h
+++ b/src/character.h
@@ -417,10 +417,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
       if (!NILP (BVAR (current_buffer, enable_multibyte_characters)))   \
         {                                                       \
           unsigned char *ptr = BYTE_POS_ADDR (BYTEIDX);         \
-          int len;                                              \
+          int string_len;                                       \
                                                                 \
-          OUTPUT= STRING_CHAR_AND_LENGTH (ptr, len);            \
-          BYTEIDX += len;                                       \
+          OUTPUT= STRING_CHAR_AND_LENGTH (ptr, string_len);     \
+          BYTEIDX += string_len;                                \
         }                                                       \
       else                                                      \
         {                                                       \