--- a/src/mule-ccl.h	Mon Aug 13 11:35:05 2007 +0200
+++ b/src/mule-ccl.h	Mon Aug 13 11:36:19 2007 +0200
@@ -1,5 +1,5 @@
 /* Header for CCL (Code Conversion Language) interpreter.
-   Copyright (C) 1995,1999 Electrotechnical Laboratory, JAPAN.
+   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
 
 This file is part of XEmacs.
@@ -19,8 +19,6 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Synched up with: FSF Emacs 20.3.10 */
-
 #ifndef INCLUDED_mule_ccl_h_
 #define INCLUDED_mule_ccl_h_
 
@@ -44,8 +42,8 @@
 				   condition flag of relational
 				   operations.  */
   int private_state;            /* CCL instruction may use this
-				   for private use, mainly for preservation
-				   internal states for suspending.
+				   for private use, mainly for saving
+				   internal states on suspending.
 				   This variable is set to 0 when ccl is 
 				   set up.  */
   int last_block;		/* Set to 1 while processing the last
@@ -55,19 +53,41 @@
 				   many times bigger the output buffer
 				   should be than the input buffer.  */
   int stack_idx;		/* How deep the call of CCL_Call is nested.  */
+  int eol_type;			/* When the CCL program is used for
+				   encoding by a coding system, set to
+				   the eol_type of the coding
+				   system.  */
+  int multibyte;		/* 1 if the source text is multibyte.  */
 };
 
-
 #define CCL_MODE_ENCODING 0
 #define CCL_MODE_DECODING 1
 
-int ccl_driver (struct ccl_program *ccl, const unsigned char *source,
-		unsigned_char_dynarr *destination, int src_bytes,
-		int *consumed, int conversion_mode);
-void setup_ccl_program (struct ccl_program *ccl, Lisp_Object val);
+#define CCL_CODING_EOL_LF	0	/* Line-feed only, same as Emacs'
+					   internal format.  */
+#define CCL_CODING_EOL_CRLF	1	/* Sequence of carriage-return and
+					   line-feed.  */
+#define CCL_CODING_EOL_CR	2	/* Carriage-return only.  */
 
 /* Alist of fontname patterns vs corresponding CCL program.  */
 extern Lisp_Object Vfont_ccl_encoder_alist;
+
+/* Setup fields of the structure pointed by CCL appropriately for the
+   execution of ccl program CCL_PROG (symbol or vector).  */
+extern int setup_ccl_program (struct ccl_program *, Lisp_Object);
+
+extern int ccl_driver (struct ccl_program *, const unsigned char *,
+		       unsigned_char_dynarr *, int, int *, int);
+
+EXFUN (Fregister_ccl_program, 2);
+
 extern Lisp_Object Qccl_program;
 
+/* Vector of CCL program names vs corresponding program data.  */
+extern Lisp_Object Vccl_program_table;
+
+/* Symbols of ccl program have this property, a value of the property
+   is an index for Vccl_program_table. */
+extern Lisp_Object Qccl_program_idx;
+
 #endif /* INCLUDED_mule_ccl_h_ */