Include character.h in every MULE.

diff --git a/src/buffer.h b/src/buffer.h
index 9af8fac..142901e 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -32,12 +32,8 @@ 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
+#include "character.h"
 #endif
 
 /************************************************************************/

diff --git a/src/lstream.h b/src/lstream.h
index 0505b9a..b2f9ea4 100644 (file)
--- a/src/lstream.h
+++ b/src/lstream.h
@@ -265,11 +265,7 @@ 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);

diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index e7b62af..15dab0e 100644 (file)
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -26,11 +26,7 @@ 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 6fc8662..9f16e8c 100644 (file)
--- a/src/mule-wnnfns.c
+++ b/src/mule-wnnfns.c
@@ -271,11 +271,7 @@ 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 abe2a0e..20f2201 100644 (file)
--- a/src/objects-msw.c
+++ b/src/objects-msw.c
@@ -41,12 +41,8 @@ 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
+#include "character.h"
 #endif
 
 #include "buffer.h"

diff --git a/src/objects-tty.c b/src/objects-tty.c
index 45225dd..909542e 100644 (file)
--- a/src/objects-tty.c
+++ b/src/objects-tty.c
@@ -29,11 +29,7 @@ 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). */

diff --git a/src/redisplay-msw.c b/src/redisplay-msw.c
index 9b02dda..a64877c 100644 (file)
--- a/src/redisplay-msw.c
+++ b/src/redisplay-msw.c
@@ -48,11 +48,7 @@ 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