Sync with r21-2-28.

[chise/xemacs-chise.git] / src / mule-ccl.c

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index b09fd3b..8273d17 100644 (file)
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -34,7 +34,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"
 
@@ -422,7 +422,7 @@ Lisp_Object Vccl_program_table;
                                          IC += 2;
                                        */
 
-#define CCL_Extention          0x1F /* Extended CCL code
+#define CCL_Extension          0x1F /* Extended CCL code
                                        1:ExtendedCOMMNDRrrRRRrrrXXXXX
                                        2:ARGUEMENT
                                        3:...
@@ -1124,9 +1124,10 @@ ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
            ic = jump_address;
          break;
 
-       case CCL_Extention:
+       case CCL_Extension:
          switch (EXCMD)
            {
+#ifndef UTF2000
            case CCL_ReadMultibyteChar2:
              if (!src)
                CCL_INVALID_CMD;
@@ -1240,7 +1241,9 @@ ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
                CCL_SUSPEND (CCL_STAT_SUSPEND_BY_SRC);
 
              break;
+#endif
 
+#ifndef UTF2000
            case CCL_WriteMultibyteChar2:
              i = reg[RRR]; /* charset */
              if (i == LEADING_BYTE_ASCII)
@@ -1260,6 +1263,7 @@ ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
              CCL_WRITE_CHAR (i);
 
              break;
+#endif
 
 #if 0
            case CCL_TranslateCharacter: