projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
lstream.c
diff --git
a/src/lstream.c
b/src/lstream.c
index
d7c4f70
..
42eb940
100644
(file)
--- a/
src/lstream.c
+++ b/
src/lstream.c
@@
-134,10
+134,10
@@
void Lstream_rewind (Lstream *stream)
#define MAX_READ_SIZE 512
static Lisp_Object
#define MAX_READ_SIZE 512
static Lisp_Object
-mark_lstream (Lisp_Object obj)
+mark_lstream (Lisp_Object obj, void (*markobj) (Lisp_Object))
{
Lstream *lstr = XLSTREAM (obj);
{
Lstream *lstr = XLSTREAM (obj);
- return lstr->imp->marker ? (lstr->imp->marker) (obj) : Qnil;
+ return lstr->imp->marker ? (lstr->imp->marker) (obj, markobj) : Qnil;
}
static void
}
static void
@@
-1214,7
+1214,7
@@
lisp_string_rewinder (Lstream *stream)
}
static Lisp_Object
}
static Lisp_Object
-lisp_string_marker (Lisp_Object stream)
+lisp_string_marker (Lisp_Object stream, void (*markobj) (Lisp_Object))
{
struct lisp_string_stream *str = LISP_STRING_STREAM_DATA (XLSTREAM (stream));
return str->obj;
{
struct lisp_string_stream *str = LISP_STRING_STREAM_DATA (XLSTREAM (stream));
return str->obj;
@@
-1612,13
+1612,13
@@
lisp_buffer_rewinder (Lstream *stream)
}
static Lisp_Object
}
static Lisp_Object
-lisp_buffer_marker (Lisp_Object stream)
+lisp_buffer_marker (Lisp_Object stream, void (*markobj) (Lisp_Object))
{
struct lisp_buffer_stream *str =
LISP_BUFFER_STREAM_DATA (XLSTREAM (stream));
{
struct lisp_buffer_stream *str =
LISP_BUFFER_STREAM_DATA (XLSTREAM (stream));
- mark_object (str->start);
- mark_object (str->end);
+ markobj (str->start);
+ markobj (str->end);
return str->buffer;
}
return str->buffer;
}
@@
-1673,19
+1673,13
@@
lstream_type_create (void)
}
void
}
void
-reinit_vars_of_lstream (void)
+vars_of_lstream (void)
{
int i;
for (i = 0; i < countof (Vlstream_free_list); i++)
{
Vlstream_free_list[i] = Qnil;
{
int i;
for (i = 0; i < countof (Vlstream_free_list); i++)
{
Vlstream_free_list[i] = Qnil;
- staticpro_nodump (&Vlstream_free_list[i]);
+ staticpro (&Vlstream_free_list[i]);
}
}
}
}
-
-void
-vars_of_lstream (void)
-{
- reinit_vars_of_lstream ();
-}