diff src/gc.c @ 5046:d4f666cda5e6

some random fixups -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * internals/internals.texi (Intro to Window and Frame Geometry): Shrink diagram to fit when offset by five spaces as a result of quoting. src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * syswindows.h: Add table about GNU Emacs -> XEmacs Windows constants from the internals manual. * frame.c: Shrink size of diagram consistent with internals manual. * alloc.c: * compiler.h: * console.c: * events.c: * gc.c (gc_stat_start_new_gc): * gc.c (gc_stat_resume_gc): * gc.c (kkcc_marking): * gc.c (gc_1): * gc.c (gc): * objects-tty.c: * redisplay-msw.c: * redisplay-msw.c (mswindows_clear_region): * syntax.c: * syntax.c (ST_COMMENT_STYLE): * sysdep.c: Fix various compiler warnings.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 03:24:08 -0600
parents 2ade80e8c640
children 24372c7e0e8f
line wrap: on
line diff
--- a/src/gc.c	Tue Feb 16 01:21:32 2010 -0600
+++ b/src/gc.c	Sat Feb 20 03:24:08 2010 -0600
@@ -184,7 +184,7 @@
   gc_state.stat[GC_STAT_IN_THIS_GC] = 0;	\
   GC_STAT_RESUME (stat)
 
-void
+static void
 gc_stat_start_new_gc (void)
 {
   gc_state.n_gc[GC_STAT_TOTAL]++;
@@ -201,7 +201,7 @@
   GC_STAT_RESTART (freed);
 } 
 
-void
+static void
 gc_stat_resume_gc (void)
 {
   gc_state.n_cycles[GC_STAT_TOTAL]++;
@@ -1022,20 +1022,14 @@
    on the kkcc_gc_stack. This function processes all elements on the stack
    according to their descriptions. */
 static void
-kkcc_marking (
-#ifdef NEW_GC
-	      int cnt
-#else /* not NEW_GC */
-	      int UNUSED(cnt)
-#endif /* not NEW_GC */ 
-	      )
+kkcc_marking (USED_IF_NEW_GC (cnt))
 {
   kkcc_gc_stack_entry *stack_entry = 0;
   void *data = 0;
   const struct memory_description *desc = 0;
   int pos;
 #ifdef NEW_GC
-  int count = cnt;
+  int obj_count = cnt;
 #endif /* NEW_GC */
 #ifdef DEBUG_XEMACS
   int level = 0;
@@ -1182,7 +1176,7 @@
 
 #ifdef NEW_GC
       if (cnt) 
-	if (!--count)
+	if (!--obj_count)
 	  break;
 #endif /* NEW_GC */
     }
@@ -1894,7 +1888,7 @@
 }
 
 
-void
+static void
 gc_1 (int incremental)
 {
   switch (GC_PHASE)
@@ -1930,7 +1924,8 @@
     }
 }
 
-void gc (int incremental)
+static void
+gc (int incremental)
 {
   if (gc_currently_forbidden
       || in_display