--- a/src/mule-ccl.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/mule-ccl.h	Mon Aug 13 11:20:41 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,18 +19,10 @@
 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_
+/* Synched up with: FSF Emacs 20.2 */
 
-/* Macros for exit status of CCL program.  */
-#define CCL_STAT_SUCCESS	0 /* Terminated successfully.  */
-#define CCL_STAT_SUSPEND_BY_SRC	1 /* Terminated by empty input.  */
-#define CCL_STAT_SUSPEND_BY_DST	2 /* Terminated by output buffer full.  */
-#define CCL_STAT_INVALID_CMD	3 /* Terminated because of invalid
-				     command.  */
-#define CCL_STAT_QUIT		4 /* Terminated because of quit.  */
+#ifndef _CCL_H
+#define _CCL_H
 
 /* Structure to hold information about running CCL code.  Read
    comments in the file ccl.c for the detail of each field.  */
@@ -43,31 +35,19 @@
   int reg[8];			/* CCL registers, reg[7] is used for
 				   condition flag of relational
 				   operations.  */
-  int private_state;            /* CCL instruction may use this
-				   for private use, mainly for preservation
-				   internal states for suspending.
-				   This variable is set to 0 when ccl is 
-				   set up.  */
   int last_block;		/* Set to 1 while processing the last
 				   block. */
   int status;			/* Exit status of the CCL program.  */
   int buf_magnification;	/* Output buffer magnification.  How
 				   many times bigger the output buffer
 				   should be than the input buffer.  */
-  int stack_idx;		/* How deep the call of CCL_Call is nested.  */
 };
 
-
-#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);
+int ccl_driver (struct ccl_program *ccl, CONST unsigned char *source,
+		unsigned_char_dynarr *destination, int src_bytes, int *consumed);
 void setup_ccl_program (struct ccl_program *ccl, Lisp_Object val);
 
 /* Alist of fontname patterns vs corresponding CCL program.  */
 extern Lisp_Object Vfont_ccl_encoder_alist;
-extern Lisp_Object Qccl_program;
 
-#endif /* INCLUDED_mule_ccl_h_ */
+#endif /* _CCL_H */