diff options
| author | Kenichi Handa | 2001-01-24 00:12:24 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2001-01-24 00:12:24 +0000 |
| commit | 9977c491547cd1df8d49815a6f1fa18734e25300 (patch) | |
| tree | 151b28febbf61703e4baf164d388fdda0fa04e19 /src | |
| parent | 3d48e6875a229e351568f5f544f361ef95fb98eb (diff) | |
| download | emacs-9977c491547cd1df8d49815a6f1fa18734e25300.tar.gz emacs-9977c491547cd1df8d49815a6f1fa18734e25300.zip | |
(CCL_READ_CHAR): Change the argument name from r to REG
as a workaround for SunOS 4's cc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ccl.c | 16 |
1 files changed, 8 insertions, 8 deletions
| @@ -734,15 +734,15 @@ static int stack_idx_of_map_multiple; | |||
| 734 | CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \ | 734 | CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \ |
| 735 | } while (0) | 735 | } while (0) |
| 736 | 736 | ||
| 737 | /* Read one byte from the current input buffer into Rth register. */ | 737 | /* Read one byte from the current input buffer into REGth register. */ |
| 738 | #define CCL_READ_CHAR(r) \ | 738 | #define CCL_READ_CHAR(REG) \ |
| 739 | do { \ | 739 | do { \ |
| 740 | if (!src) \ | 740 | if (!src) \ |
| 741 | CCL_INVALID_CMD; \ | 741 | CCL_INVALID_CMD; \ |
| 742 | else if (src < src_end) \ | 742 | else if (src < src_end) \ |
| 743 | { \ | 743 | { \ |
| 744 | r = *src++; \ | 744 | REG = *src++; \ |
| 745 | if (r == '\n' \ | 745 | if (REG == '\n' \ |
| 746 | && ccl->eol_type != CODING_EOL_LF) \ | 746 | && ccl->eol_type != CODING_EOL_LF) \ |
| 747 | { \ | 747 | { \ |
| 748 | /* We are encoding. */ \ | 748 | /* We are encoding. */ \ |
| @@ -753,16 +753,16 @@ static int stack_idx_of_map_multiple; | |||
| 753 | else \ | 753 | else \ |
| 754 | { \ | 754 | { \ |
| 755 | ccl->cr_consumed = 1; \ | 755 | ccl->cr_consumed = 1; \ |
| 756 | r = '\r'; \ | 756 | REG = '\r'; \ |
| 757 | src--; \ | 757 | src--; \ |
| 758 | } \ | 758 | } \ |
| 759 | } \ | 759 | } \ |
| 760 | else \ | 760 | else \ |
| 761 | r = '\r'; \ | 761 | REG = '\r'; \ |
| 762 | } \ | 762 | } \ |
| 763 | if (r == LEADING_CODE_8_BIT_CONTROL \ | 763 | if (REG == LEADING_CODE_8_BIT_CONTROL \ |
| 764 | && ccl->multibyte) \ | 764 | && ccl->multibyte) \ |
| 765 | r = *src++ - 0x20; \ | 765 | REG = *src++ - 0x20; \ |
| 766 | } \ | 766 | } \ |
| 767 | else if (ccl->last_block) \ | 767 | else if (ccl->last_block) \ |
| 768 | { \ | 768 | { \ |