comparison src/alloc.c @ 11018:2d9bdf1ba3d1

(mark_kboards): Renamed from mark_perdisplays.
author Karl Heuer <kwzh@gnu.org>
date Wed, 15 Mar 1995 01:57:05 +0000
parents 7b2e18d65fed
children 3f19a379eb99
comparison
equal deleted inserted replaced
11017:f7c4ece024d5 11018:2d9bdf1ba3d1
152 int stack_copy_size; 152 int stack_copy_size;
153 153
154 /* Non-zero means ignore malloc warnings. Set during initialization. */ 154 /* Non-zero means ignore malloc warnings. Set during initialization. */
155 int ignore_warnings; 155 int ignore_warnings;
156 156
157 static void mark_object (), mark_buffer (), mark_perdisplays (); 157 static void mark_object (), mark_buffer (), mark_kboards ();
158 static void clear_marks (), gc_sweep (); 158 static void clear_marks (), gc_sweep ();
159 static void compact_strings (); 159 static void compact_strings ();
160 160
161 /* Versions of malloc and realloc that print warnings as memory gets full. */ 161 /* Versions of malloc and realloc that print warnings as memory gets full. */
162 162
1444 { 1444 {
1445 mark_object (&backlist->args[i]); 1445 mark_object (&backlist->args[i]);
1446 XMARK (backlist->args[i]); 1446 XMARK (backlist->args[i]);
1447 } 1447 }
1448 } 1448 }
1449 mark_perdisplays (); 1449 mark_kboards ();
1450 1450
1451 gc_sweep (); 1451 gc_sweep ();
1452 1452
1453 /* Clear the mark bits that we set in certain root slots. */ 1453 /* Clear the mark bits that we set in certain root slots. */
1454 1454
1761 1761
1762 case Lisp_Misc_Intfwd: 1762 case Lisp_Misc_Intfwd:
1763 case Lisp_Misc_Boolfwd: 1763 case Lisp_Misc_Boolfwd:
1764 case Lisp_Misc_Objfwd: 1764 case Lisp_Misc_Objfwd:
1765 case Lisp_Misc_Buffer_Objfwd: 1765 case Lisp_Misc_Buffer_Objfwd:
1766 case Lisp_Misc_Display_Objfwd: 1766 case Lisp_Misc_Kboard_Objfwd:
1767 /* Don't bother with Lisp_Buffer_Objfwd, 1767 /* Don't bother with Lisp_Buffer_Objfwd,
1768 since all markable slots in current buffer marked anyway. */ 1768 since all markable slots in current buffer marked anyway. */
1769 /* Don't need to do Lisp_Objfwd, since the places they point 1769 /* Don't need to do Lisp_Objfwd, since the places they point
1770 are protected with staticpro. */ 1770 are protected with staticpro. */
1771 break; 1771 break;
1866 mark_buffer (base_buffer); 1866 mark_buffer (base_buffer);
1867 } 1867 }
1868 } 1868 }
1869 1869
1870 1870
1871 /* Mark the pointers in the perdisplay objects. */ 1871 /* Mark the pointers in the kboard objects. */
1872 1872
1873 static void 1873 static void
1874 mark_perdisplays () 1874 mark_kboards ()
1875 { 1875 {
1876 PERDISPLAY *perd; 1876 KBOARD *kb;
1877 for (perd = all_perdisplays; perd; perd = perd->next_perdisplay) 1877 for (kb = all_kboards; kb; kb = kb->next_kboard)
1878 { 1878 {
1879 mark_object (&perd->prefix_factor); 1879 mark_object (&kb->prefix_factor);
1880 mark_object (&perd->prefix_value); 1880 mark_object (&kb->prefix_value);
1881 mark_object (&perd->kbd_queue); 1881 mark_object (&kb->kbd_queue);
1882 mark_object (&perd->Vlast_kbd_macro); 1882 mark_object (&kb->Vlast_kbd_macro);
1883 } 1883 }
1884 } 1884 }
1885 1885
1886 /* Sweep: find all structures not marked, and free them. */ 1886 /* Sweep: find all structures not marked, and free them. */
1887 1887