From: Ken Raeburn Date: Tue, 16 Jul 2002 15:49:03 +0000 (+0000) Subject: * charset.h (FETCH_STRING_CHAR_ADVANCE, X-Git-Tag: ttn-vms-21-2-B4~14093 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e9538829322119c0530ab69ed2f58eda2d51722;p=emacs.git * 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 62383e603ba..d8d504b8283 100644 --- 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; \ \