Mercurial > hg > xemacs-beta
diff src/gc.c @ 5027:22179cd0fe15
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 10 Feb 2010 07:25:19 -0600 |
parents | 2ade80e8c640 |
children | d4f666cda5e6 |
line wrap: on
line diff
--- a/src/gc.c Wed Feb 10 07:15:36 2010 -0600 +++ b/src/gc.c Wed Feb 10 07:25:19 2010 -0600 @@ -1449,7 +1449,7 @@ #define MAX_SAVE_STACK 0 /* 16000 */ #endif -void +static void show_gc_cursor_and_message (void) { /* Now show the GC cursor/message. */ @@ -1506,7 +1506,7 @@ } } -void +static void remove_gc_cursor_and_message (void) { /* Now remove the GC cursor/message */ @@ -1536,7 +1536,7 @@ } } -void +static void gc_prepare (void) { #if MAX_SAVE_STACK > 0 @@ -1568,7 +1568,7 @@ gc_in_progress = 1; #ifndef NEW_GC - inhibit_non_essential_conversion_operations = 1; + inhibit_non_essential_conversion_operations++; #endif /* not NEW_GC */ #if MAX_SAVE_STACK > 0 @@ -1604,7 +1604,7 @@ cleanup_buffer_undo_lists (); } -void +static void gc_mark_root_set ( #ifdef NEW_GC enum gc_phase phase @@ -1711,7 +1711,7 @@ #endif } -void +static void gc_finish_mark (void) { #ifdef NEW_GC @@ -1758,14 +1758,14 @@ } #ifdef NEW_GC -void +static void gc_finalize (void) { GC_SET_PHASE (FINALIZE); register_for_finalization (); } -void +static void gc_sweep (void) { GC_SET_PHASE (SWEEP); @@ -1774,7 +1774,7 @@ #endif /* NEW_GC */ -void +static void gc_finish (void) { #ifdef NEW_GC @@ -1789,7 +1789,7 @@ recompute_need_to_garbage_collect (); #ifndef NEW_GC - inhibit_non_essential_conversion_operations = 0; + inhibit_non_essential_conversion_operations--; #endif /* not NEW_GC */ gc_in_progress = 0; @@ -1815,7 +1815,7 @@ } #ifdef NEW_GC -void +static void gc_suspend_mark_phase (void) { PROFILE_RECORD_EXITING_SECTION (QSin_garbage_collection); @@ -1824,7 +1824,7 @@ vdb_start_dirty_bits_recording (); } -int +static int gc_resume_mark_phase (void) { PROFILE_RECORD_ENTERING_SECTION (QSin_garbage_collection); @@ -1834,7 +1834,7 @@ return vdb_read_dirty_bits (); } -int +static int gc_mark (int incremental) { GC_SET_PHASE (MARK); @@ -1854,7 +1854,7 @@ return 1; } -int +static int gc_resume_mark (int incremental) { if (!incremental)