projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(CHAR_TO_CHARC): New inline function.
[chise/xemacs-chise.git-]
/
src
/
lstream.h
diff --git
a/src/lstream.h
b/src/lstream.h
index
e1674c2
..
482583b
100644
(file)
--- a/
src/lstream.h
+++ b/
src/lstream.h
@@
-175,10
+175,10
@@
struct lstream
((lstr)->imp == lstream_##type)
#ifdef ERROR_CHECK_TYPECHECK
((lstr)->imp == lstream_##type)
#ifdef ERROR_CHECK_TYPECHECK
-INLINE struct lstream *
+INLINE_HEADER struct lstream *
error_check_lstream_type (struct lstream *stream,
const Lstream_implementation *imp);
error_check_lstream_type (struct lstream *stream,
const Lstream_implementation *imp);
-INLINE struct lstream *
+INLINE_HEADER struct lstream *
error_check_lstream_type (struct lstream *stream,
const Lstream_implementation *imp)
{
error_check_lstream_type (struct lstream *stream,
const Lstream_implementation *imp)
{
@@
-265,11
+265,15
@@
void Lstream_set_character_mode (Lstream *str);
#ifdef MULE
#ifndef BYTE_ASCII_P
#ifdef MULE
#ifndef BYTE_ASCII_P
-#include "mule-charset.h"
+#include "multibyte.h"
#endif
#endif
-INLINE Emchar Lstream_get_emchar (Lstream *stream);
-INLINE Emchar
+#ifndef CHAR_ASCII_P
+#include "character.h"
+#endif
+
+INLINE_HEADER Emchar Lstream_get_emchar (Lstream *stream);
+INLINE_HEADER Emchar
Lstream_get_emchar (Lstream *stream)
{
int c = Lstream_getc (stream);
Lstream_get_emchar (Lstream *stream)
{
int c = Lstream_getc (stream);
@@
-277,8
+281,8
@@
Lstream_get_emchar (Lstream *stream)
Lstream_get_emchar_1 (stream, c);
}
Lstream_get_emchar_1 (stream, c);
}
-INLINE int Lstream_put_emchar (Lstream *stream, Emchar ch);
-INLINE int
+INLINE_HEADER int Lstream_put_emchar (Lstream *stream, Emchar ch);
+INLINE_HEADER int
Lstream_put_emchar (Lstream *stream, Emchar ch)
{
return CHAR_ASCII_P (ch) ?
Lstream_put_emchar (Lstream *stream, Emchar ch)
{
return CHAR_ASCII_P (ch) ?
@@
-286,8
+290,8
@@
Lstream_put_emchar (Lstream *stream, Emchar ch)
Lstream_fput_emchar (stream, ch);
}
Lstream_fput_emchar (stream, ch);
}
-INLINE void Lstream_unget_emchar (Lstream *stream, Emchar ch);
-INLINE void
+INLINE_HEADER void Lstream_unget_emchar (Lstream *stream, Emchar ch);
+INLINE_HEADER void
Lstream_unget_emchar (Lstream *stream, Emchar ch)
{
if (CHAR_ASCII_P (ch))
Lstream_unget_emchar (Lstream *stream, Emchar ch)
{
if (CHAR_ASCII_P (ch))