#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);
- return lstr->imp->marker ? (lstr->imp->marker) (obj) : Qnil;
+ return lstr->imp->marker ? (lstr->imp->marker) (obj, markobj) : Qnil;
}
static void
}
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;
}
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));
- mark_object (str->start);
- mark_object (str->end);
+ markobj (str->start);
+ markobj (str->end);
return str->buffer;
}
}
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;
- staticpro_nodump (&Vlstream_free_list[i]);
+ staticpro (&Vlstream_free_list[i]);
}
}
-
-void
-vars_of_lstream (void)
-{
- reinit_vars_of_lstream ();
-}