From 9e7d97ff1c37067026d843162584e47792968e36 Mon Sep 17 00:00:00 2001
From: tomo <tomo>
Date: Thu, 17 Jun 1999 10:45:54 +0000
Subject: [PATCH] Use "character.h" instead of "mule-charset.h" if
 CHAR_IS_UCS4 is defined.

---
 src/buffer.h        |    4 ++++
 src/lstream.h       |    4 ++++
 src/mule-ccl.c      |    4 ++++
 src/mule-wnnfns.c   |    4 ++++
 src/objects-msw.c   |    4 ++++
 src/objects-tty.c   |    4 ++++
 src/redisplay-msw.c |    4 ++++
 7 files changed, 28 insertions(+)

diff --git a/src/buffer.h b/src/buffer.h
index 623c1cc..9af8fac 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -32,9 +32,13 @@ Boston, MA 02111-1307, USA.  */
 #ifndef _XEMACS_BUFFER_H_
 #define _XEMACS_BUFFER_H_
 
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #ifdef MULE
 #include "mule-charset.h"
 #endif
+#endif
 
 /************************************************************************/
 /*                                                                      */
diff --git a/src/lstream.h b/src/lstream.h
index e67bf4d..0505b9a 100644
--- a/src/lstream.h
+++ b/src/lstream.h
@@ -265,8 +265,12 @@ void Lstream_set_character_mode (Lstream *str);
 #ifdef MULE
 
 #ifndef BYTE_ASCII_P
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #include "mule-charset.h"
 #endif
+#endif
 
 INLINE Emchar Lstream_get_emchar (Lstream *stream);
 INLINE Emchar
diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index ab4cd67..e7b62af 100644
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -26,7 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #include "mule-charset.h"
+#endif
 #include "mule-ccl.h"
 #include "file-coding.h"
 
diff --git a/src/mule-wnnfns.c b/src/mule-wnnfns.c
index 1569365..6fc8662 100644
--- a/src/mule-wnnfns.c
+++ b/src/mule-wnnfns.c
@@ -271,7 +271,11 @@ Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 
 #include "wnn/commonhd.h"
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #include "mule-charset.h"
+#endif
 #include "wnn/jllib.h"
 #include "wnn/cplib.h"
 
diff --git a/src/objects-msw.c b/src/objects-msw.c
index 15abb2c..abe2a0e 100644
--- a/src/objects-msw.c
+++ b/src/objects-msw.c
@@ -41,9 +41,13 @@ Boston, MA 02111-1307, USA.  */
 #include "console-msw.h"
 #include "objects-msw.h"
 
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #ifdef MULE
 #include "mule-charset.h"
 #endif
+#endif
 
 #include "buffer.h"
 #include "device.h"
diff --git a/src/objects-tty.c b/src/objects-tty.c
index 7e02318..45225dd 100644
--- a/src/objects-tty.c
+++ b/src/objects-tty.c
@@ -29,8 +29,12 @@ Boston, MA 02111-1307, USA.  */
 #include "objects-tty.h"
 #ifdef MULE
 #include "device.h"
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #include "mule-charset.h"
 #endif
+#endif
 
 /* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
 Lisp_Object Vtty_color_alist;
diff --git a/src/redisplay-msw.c b/src/redisplay-msw.c
index 00ed917..9b02dda 100644
--- a/src/redisplay-msw.c
+++ b/src/redisplay-msw.c
@@ -48,8 +48,12 @@ Boston, MA 02111-1307, USA.  */
 #include "windows.h"
 #ifdef MULE
 #include "mule-ccl.h"
+#ifdef CHAR_IS_UCS4
+#include "character.h"
+#else
 #include "mule-charset.h"
 #endif
+#endif
 
 #define MSWINDOWS_EOL_CURSOR_WIDTH	5
 
-- 
1.7.10.4