Mercurial > hg > xemacs-beta
diff src/lstream.c @ 5118:e0db3c197671 ben-lisp-object
merge up to latest default branch, doesn't compile yet
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 26 Dec 2009 21:18:49 -0600 |
| parents | 3742ea8250b5 d674024a8674 |
| children | 623d57b7fbe8 |
line wrap: on
line diff
--- a/src/lstream.c Sat Dec 26 00:20:27 2009 -0600 +++ b/src/lstream.c Sat Dec 26 21:18:49 2009 -0600 @@ -150,7 +150,7 @@ 0, lstream_empty_extra_description_1 }; -DEFINE_NONDUMPABLE_SIZABLE_LISP_OBJECT ("stream", lstream, +DEFINE_NODUMP_SIZABLE_LISP_OBJECT ("stream", lstream, mark_lstream, print_lstream, finalize_lstream, 0, 0, lstream_description, @@ -179,11 +179,11 @@ } } -#ifndef MC_ALLOC +#ifndef NEW_GC static const Lstream_implementation *lstream_types[32]; static Lisp_Object Vlstream_free_list[32]; static int lstream_type_count; -#endif /* not MC_ALLOC */ +#endif /* not NEW_GC */ /* Allocate and return a new Lstream. This function is not really meant to be called directly; rather, each stream type should @@ -195,10 +195,10 @@ Lstream_new (const Lstream_implementation *imp, const char *mode) { Lstream *p; -#ifdef MC_ALLOC +#ifdef NEW_GC p = XLSTREAM (alloc_sized_lrecord (aligned_sizeof_lstream (imp->size), &lrecord_lstream)); -#else /* not MC_ALLOC */ +#else /* not NEW_GC */ int i; for (i = 0; i < lstream_type_count; i++) @@ -218,7 +218,7 @@ } p = XLSTREAM (alloc_managed_lcrecord (Vlstream_free_list[i])); -#endif /* not MC_ALLOC */ +#endif /* not NEW_GC */ /* Zero it out, except the header. */ memset ((char *) p + sizeof (p->header), '\0', aligned_sizeof_lstream (imp->size) - sizeof (p->header)); @@ -294,14 +294,14 @@ void Lstream_delete (Lstream *lstr) { -#ifndef MC_ALLOC +#ifndef NEW_GC int i; -#endif /* not MC_ALLOC */ +#endif /* not NEW_GC */ Lisp_Object val = wrap_lstream (lstr); -#ifdef MC_ALLOC +#ifdef NEW_GC free_lrecord (val); -#else /* not MC_ALLOC */ +#else /* not NEW_GC */ for (i = 0; i < lstream_type_count; i++) { if (lstream_types[i] == lstr->imp) @@ -312,7 +312,7 @@ } ABORT (); -#endif /* not MC_ALLOC */ +#endif /* not NEW_GC */ } #define Lstream_internal_error(reason, lstr) \ @@ -1863,7 +1863,7 @@ LSTREAM_HAS_METHOD (lisp_buffer, marker); } -#ifndef MC_ALLOC +#ifndef NEW_GC void reinit_vars_of_lstream (void) { @@ -1875,7 +1875,7 @@ staticpro_nodump (&Vlstream_free_list[i]); } } -#endif /* not MC_ALLOC */ +#endif /* not NEW_GC */ void vars_of_lstream (void)