* character.h (FETCH_CHAR_ADVANCE): Rename locals to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b707c4b463278c4978406a4bf60e928b74920e7..4b3f0ceca362f743c65fb4d5675cfb3484b6c30e 100644 (file)
--- 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 f0b0002032e063cc35db645b824b991e897c62ca..77c670728d0ccee6306cbe105d578c7ad9238261 100644 (file)
--- 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                                                     \
        {                                                       \