]> git.eshelyaron.com Git - emacs.git/commitdiff
(CCL_READ_CHAR): Change the argument name from r to REG
authorKenichi Handa <handa@m17n.org>
Wed, 24 Jan 2001 00:12:24 +0000 (00:12 +0000)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Jan 2001 00:12:24 +0000 (00:12 +0000)
as a workaround for SunOS 4's cc.

src/ccl.c

index 2b1e824933e89b2f29d5d31d3a06ef675423cfc7..bb78022184893dd8d1b92646fb2d3eb1bf7d0c49 100644 (file)
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -734,15 +734,15 @@ static int stack_idx_of_map_multiple;
       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 @@ static int stack_idx_of_map_multiple;
                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)                          \
       {                                                        \