Mercurial > emacs
changeset 85344:99492f857499
(free_misc): Use XMISCTYPE.
(live_misc_p, gc_sweep): Use Lisp_Misc_Any.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 17 Oct 2007 02:10:38 +0000 |
| parents | 54bb69a4ec60 |
| children | 35d2f0abc597 |
| files | src/ChangeLog src/alloc.c |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Oct 17 02:08:32 2007 +0000 +++ b/src/ChangeLog Wed Oct 17 02:10:38 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * alloc.c (free_misc): Use XMISCTYPE. + (live_misc_p, gc_sweep): Use Lisp_Misc_Any. + 2007-10-17 Glenn Morris <rgm@gnu.org> * minibuf.c (Qcompletion_ignore_case): New Lisp_Object.
--- a/src/alloc.c Wed Oct 17 02:08:32 2007 +0000 +++ b/src/alloc.c Wed Oct 17 02:10:38 2007 +0000 @@ -3364,7 +3364,7 @@ free_misc (misc) Lisp_Object misc; { - XMISC (misc)->u_marker.type = Lisp_Misc_Free; + XMISCTYPE (misc) = Lisp_Misc_Free; XMISC (misc)->u_free.chain = marker_free_list; marker_free_list = XMISC (misc); @@ -4080,7 +4080,7 @@ && offset < (MARKER_BLOCK_SIZE * sizeof b->markers[0]) && (b != marker_block || offset / sizeof b->markers[0] < marker_block_index) - && ((union Lisp_Misc *) p)->u_marker.type != Lisp_Misc_Free); + && ((union Lisp_Misc *) p)->u_any.type != Lisp_Misc_Free); } else return 0; @@ -6148,9 +6148,9 @@ for (i = 0; i < lim; i++) { - if (!mblk->markers[i].u_marker.gcmarkbit) + if (!mblk->markers[i].u_any.gcmarkbit) { - if (mblk->markers[i].u_marker.type == Lisp_Misc_Marker) + if (mblk->markers[i].u_any.type == Lisp_Misc_Marker) unchain_marker (&mblk->markers[i].u_marker); /* Set the type of the freed object to Lisp_Misc_Free. We could leave the type alone, since nobody checks it, @@ -6163,7 +6163,7 @@ else { num_used++; - mblk->markers[i].u_marker.gcmarkbit = 0; + mblk->markers[i].u_any.gcmarkbit = 0; } } lim = MARKER_BLOCK_SIZE;