diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-17 02:10:38 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-10-17 02:10:38 +0000 |
| commit | d314756ea8059b422eebf9f1f435fe19f589fc5c (patch) | |
| tree | 3a8dad2db054a0fe5a355383e8e8e7d7ea706888 /src | |
| parent | 820b9143335905206f96f7108f66438038e67fd7 (diff) | |
| download | emacs-d314756ea8059b422eebf9f1f435fe19f589fc5c.tar.gz | |
(free_misc): Use XMISCTYPE.
(live_misc_p, gc_sweep): Use Lisp_Misc_Any.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 48ef2f869ad..81cdd0b9d00 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/alloc.c b/src/alloc.c index c42c27f0333..a768180bfe3 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -3364,7 +3364,7 @@ void 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 @@ live_misc_p (m, p) && 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 @@ gc_sweep () 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 @@ gc_sweep () else { num_used++; - mblk->markers[i].u_marker.gcmarkbit = 0; + mblk->markers[i].u_any.gcmarkbit = 0; } } lim = MARKER_BLOCK_SIZE; |