# HG changeset patch # User Kenichi Handa # Date 980295144 0 # Node ID 74e192d083e9866f646d2ee64d6f4a883fcc93b4 # Parent afce7f1c2ba5bdcd4bfb34eab82abfe38f7f679d (CCL_READ_CHAR): Change the argument name from r to REG as a workaround for SunOS 4's cc. diff -r afce7f1c2ba5 -r 74e192d083e9 src/ccl.c --- a/src/ccl.c Wed Jan 24 00:12:10 2001 +0000 +++ b/src/ccl.c Wed Jan 24 00:12:24 2001 +0000 @@ -734,15 +734,15 @@ CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \ } while (0) -/* Read one byte from the current input buffer into Rth register. */ -#define CCL_READ_CHAR(r) \ +/* Read one byte from the current input buffer into REGth register. */ +#define CCL_READ_CHAR(REG) \ do { \ if (!src) \ CCL_INVALID_CMD; \ else if (src < src_end) \ { \ - r = *src++; \ - if (r == '\n' \ + REG = *src++; \ + if (REG == '\n' \ && ccl->eol_type != CODING_EOL_LF) \ { \ /* We are encoding. */ \ @@ -753,16 +753,16 @@ else \ { \ ccl->cr_consumed = 1; \ - r = '\r'; \ + REG = '\r'; \ src--; \ } \ } \ else \ - r = '\r'; \ + REG = '\r'; \ } \ - if (r == LEADING_CODE_8_BIT_CONTROL \ + if (REG == LEADING_CODE_8_BIT_CONTROL \ && ccl->multibyte) \ - r = *src++ - 0x20; \ + REG = *src++ - 0x20; \ } \ else if (ccl->last_block) \ { \