* charset.h (FETCH_STRING_CHAR_ADVANCE,

FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SDATA when getting
address of string contents.

diff --git a/src/charset.h b/src/charset.h
index 62383e603ba48175d8211e98d58d06f33ac54bd0..d8d504b828343357fc1f68119e554c4f9b00216a 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -573,7 +573,7 @@ if (1)                                                                         \
     CHARIDX++;                                                            \
     if (STRING_MULTIBYTE (STRING))                                        \
       {                                                                           \
-       unsigned char *ptr = &SREF (STRING, BYTEIDX);                      \
+       unsigned char *ptr = SDATA (STRING) + BYTEIDX;                     \
        int space_left = XSTRING (STRING)->size_byte - BYTEIDX;            \
        int actual_len;                                                    \
                                                                           \
@@ -590,7 +590,7 @@ else
 #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX)  \
 if (1)                                                                       \
   {                                                                          \
-    unsigned char *fetch_string_char_ptr = &SREF (STRING, BYTEIDX);  \
+    unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX;         \
     int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \
     int actual_len;                                                          \
                                                                              \