Mercurial > hg > xemacs-beta
changeset 5061:e7b120e28b49
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 21 Feb 2010 21:01:09 -0600 |
| parents | 86041556214b (current diff) 24372c7e0e8f (diff) |
| children | 151d425f8ef0 |
| files | src/ChangeLog |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Feb 21 21:00:09 2010 -0600 +++ b/src/ChangeLog Sun Feb 21 21:01:09 2010 -0600 @@ -54,6 +54,12 @@ 2010-02-21 Ben Wing <ben@xemacs.org> + * gc.c (kkcc_marking): Fix compile error. + * mc-alloc.c: + #if 0 out some unused functions. + +2010-02-21 Ben Wing <ben@xemacs.org> + * extents.c (process_extents_for_insertion_mapper): Assertion wasn't quite set up correctly in previous patch.
--- a/src/gc.c Sun Feb 21 21:00:09 2010 -0600 +++ b/src/gc.c Sun Feb 21 21:01:09 2010 -0600 @@ -1022,7 +1022,7 @@ on the kkcc_gc_stack. This function processes all elements on the stack according to their descriptions. */ static void -kkcc_marking (USED_IF_NEW_GC (cnt)) +kkcc_marking (int USED_IF_NEW_GC (cnt)) { kkcc_gc_stack_entry *stack_entry = 0; void *data = 0;
--- a/src/mc-alloc.c Sun Feb 21 21:00:09 2010 -0600 +++ b/src/mc-alloc.c Sun Feb 21 21:01:09 2010 -0600 @@ -1782,6 +1782,8 @@ /*--- incremental garbage collector ----------------------------------*/ +#if 0 /* currently unused */ + /* access dirty bit of page header */ static void set_dirty_bit (page_header *ph, unsigned int value) @@ -1841,6 +1843,8 @@ return PH_HEAP_SPACE (get_page_header (ptr)); } +#endif /* 0 */ + /* Make PAGE_SIZE globally available. */ EMACS_INT mc_get_page_size ()