diff options
| author | Ken Raeburn | 2002-07-16 15:49:03 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2002-07-16 15:49:03 +0000 |
| commit | 5e9538829322119c0530ab69ed2f58eda2d51722 (patch) | |
| tree | b72fc7b57701fd7045812f941a7ba8e8b38339d3 /src | |
| parent | f5b81cd81dc8e07bb6377fae8a6904191426f893 (diff) | |
| download | emacs-5e9538829322119c0530ab69ed2f58eda2d51722.tar.gz emacs-5e9538829322119c0530ab69ed2f58eda2d51722.zip | |
* charset.h (FETCH_STRING_CHAR_ADVANCE,
FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SDATA when getting
address of string contents.
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) \ | |||
| 573 | CHARIDX++; \ | 573 | CHARIDX++; \ |
| 574 | if (STRING_MULTIBYTE (STRING)) \ | 574 | if (STRING_MULTIBYTE (STRING)) \ |
| 575 | { \ | 575 | { \ |
| 576 | unsigned char *ptr = &SREF (STRING, BYTEIDX); \ | 576 | unsigned char *ptr = SDATA (STRING) + BYTEIDX; \ |
| 577 | int space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ | 577 | int space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ |
| 578 | int actual_len; \ | 578 | int actual_len; \ |
| 579 | \ | 579 | \ |
| @@ -590,7 +590,7 @@ else | |||
| 590 | #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \ | 590 | #define FETCH_STRING_CHAR_ADVANCE_NO_CHECK(OUTPUT, STRING, CHARIDX, BYTEIDX) \ |
| 591 | if (1) \ | 591 | if (1) \ |
| 592 | { \ | 592 | { \ |
| 593 | unsigned char *fetch_string_char_ptr = &SREF (STRING, BYTEIDX); \ | 593 | unsigned char *fetch_string_char_ptr = SDATA (STRING) + BYTEIDX; \ |
| 594 | int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ | 594 | int fetch_string_char_space_left = XSTRING (STRING)->size_byte - BYTEIDX; \ |
| 595 | int actual_len; \ | 595 | int actual_len; \ |
| 596 | \ | 596 | \ |