X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Flstream.h;h=877f66ca21d71d0d1702b4117c50e1359ec10c01;hb=7edd70c9f9aed4de8014b6b63a7e7316f8e695f7;hp=b46adbc9c6dbbe482244efb75d59728fc7be97cd;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git-

diff --git a/src/lstream.h b/src/lstream.h
index b46adbc..877f66c 100644
--- a/src/lstream.h
+++ b/src/lstream.h
@@ -167,8 +167,8 @@ struct lstream
   size_t unget_buffer_ind; /* pointer to next buffer spot to write a character */
 
   size_t byte_count;
-  long flags;  /* Align pointer for 64 bit machines (kny) */
-  char data[1];
+  int flags;
+  max_align_t data[1];
 };
 
 #define LSTREAM_TYPE_P(lstr, type) \
@@ -265,7 +265,11 @@ void Lstream_set_character_mode (Lstream *str);
 #ifdef MULE
 
 #ifndef BYTE_ASCII_P
-#include "mule-charset.h"
+#include "multibyte.h"
+#endif
+
+#ifndef CHAR_ASCII_P
+#include "character.h"
 #endif
 
 INLINE_HEADER Emchar Lstream_get_emchar (Lstream *stream);