X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fmule-ccl.c;h=a6576e7cc29f7d32f2a1aebc93e304429e046e8a;hb=602c4285133172ac567ca0080bc71fbcde1980d5;hp=afd30d61b589f85e22416b6847d42d6f77c213ec;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git-

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index afd30d6..a6576e7 100644
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "lisp.h"
 #include "buffer.h"
-#include "mule-charset.h"
+#include "character.h"
 #include "mule-ccl.h"
 #include "file-coding.h"
 
@@ -600,7 +600,7 @@ static tr_stack *mapping_stack_pointer;
 
 /* If this variable is non-zero, it indicates the stack_idx
    of immediately called by CCL_MapMultiple. */
-static int stack_idx_of_map_multiple = 0;
+static int stack_idx_of_map_multiple;
 
 #define PUSH_MAPPING_STACK(restlen, orig)		\
   do {							\
@@ -1271,6 +1271,7 @@ ccl_driver (struct ccl_program *ccl,
 	case CCL_Extention:
 	  switch (EXCMD)
 	    {
+#ifndef UTF2000
 	    case CCL_ReadMultibyteChar2:
 	      if (!src)
 		CCL_INVALID_CMD;
@@ -1342,7 +1343,9 @@ ccl_driver (struct ccl_program *ccl,
 		CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
 
 	      break;
+#endif
 
+#ifndef UTF2000
 	    case CCL_WriteMultibyteChar2:
 	      i = reg[RRR]; /* charset */
 	      if (i == LEADING_BYTE_ASCII)
@@ -1358,6 +1361,7 @@ ccl_driver (struct ccl_program *ccl,
 	      CCL_WRITE_CHAR (i);
 
 	      break;
+#endif
 
 	    case CCL_TranslateCharacter:
 #if 0