From: Kenichi Handa <handa@m17n.org>
Date: Wed, 24 Jan 2001 00:12:24 +0000 (+0000)
Subject: (CCL_READ_CHAR): Change the argument name from r to REG
X-Git-Tag: emacs-pretest-21.0.96~139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9977c491547cd1df8d49815a6f1fa18734e25300;p=emacs.git

(CCL_READ_CHAR): Change the argument name from r to REG
as a workaround for SunOS 4's cc.
---

diff --git a/src/ccl.c b/src/ccl.c
index 2b1e824933e..bb780221848 100644
--- 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)				\
       {							\