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

1 files changed, 3 insertions, 3 deletions

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                                                      \
         {                                                       \