* chartab.c (ASET_RANGE, GET_SUB_CHAR_TABLE): Remove unused macros.

[bpt/emacs.git] / src / character.h

diff --git a/src/character.h b/src/character.h
index fb29ced..d29ab41 100644 (file)
--- a/src/character.h
+++ b/src/character.h
@@ -356,11 +356,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
       CHARIDX++;                                                       \
       if (STRING_MULTIBYTE (STRING))                                   \
        {                                                               \
-         unsigned char *ptr = &SDATA (STRING)[BYTEIDX];                \
-         int len;                                                      \
+         unsigned char *string_ptr = &SDATA (STRING)[BYTEIDX];         \
+         int string_len;                                               \
                                                                        \
-         OUTPUT = STRING_CHAR_AND_LENGTH (ptr, len);                   \
-         BYTEIDX += len;                                               \
+         OUTPUT = STRING_CHAR_AND_LENGTH (string_ptr, string_len);     \
+         BYTEIDX += string_len;                                        \
        }                                                               \
       else                                                             \
        {                                                               \