comparison src/alloc.c @ 5027:22179cd0fe15

merge
author Ben Wing <ben@xemacs.org>
date Wed, 10 Feb 2010 07:25:19 -0600
parents 2ade80e8c640
children d4f666cda5e6 b5df3737028a
comparison
equal deleted inserted replaced
5026:46cf825f6158 5027:22179cd0fe15
3302 Dynarr_add (staticpros, varaddress); 3302 Dynarr_add (staticpros, varaddress);
3303 Dynarr_add (staticpro_names, varname); 3303 Dynarr_add (staticpro_names, varname);
3304 dump_add_root_lisp_object (varaddress); 3304 dump_add_root_lisp_object (varaddress);
3305 } 3305 }
3306 3306
3307 const Ascbyte *staticpro_name (int count);
3308
3307 /* External debugging function: Return the name of the variable at offset 3309 /* External debugging function: Return the name of the variable at offset
3308 COUNT. */ 3310 COUNT. */
3309 const Ascbyte * 3311 const Ascbyte *
3310 staticpro_name (int count) 3312 staticpro_name (int count)
3311 { 3313 {
3321 staticpro_nodump_1 (Lisp_Object *varaddress, const Ascbyte *varname) 3323 staticpro_nodump_1 (Lisp_Object *varaddress, const Ascbyte *varname)
3322 { 3324 {
3323 Dynarr_add (staticpros_nodump, varaddress); 3325 Dynarr_add (staticpros_nodump, varaddress);
3324 Dynarr_add (staticpro_nodump_names, varname); 3326 Dynarr_add (staticpro_nodump_names, varname);
3325 } 3327 }
3328
3329 const Ascbyte *staticpro_nodump_name (int count);
3326 3330
3327 /* External debugging function: Return the name of the variable at offset 3331 /* External debugging function: Return the name of the variable at offset
3328 COUNT. */ 3332 COUNT. */
3329 const Ascbyte * 3333 const Ascbyte *
3330 staticpro_nodump_name (int count) 3334 staticpro_nodump_name (int count)
4134 #endif /* defined (MULE) && defined (VERIFY_STRING_CHARS_INTEGRITY) */ 4138 #endif /* defined (MULE) && defined (VERIFY_STRING_CHARS_INTEGRITY) */
4135 4139
4136 #ifndef NEW_GC 4140 #ifndef NEW_GC
4137 /* Compactify string chars, relocating the reference to each -- 4141 /* Compactify string chars, relocating the reference to each --
4138 free any empty string_chars_block we see. */ 4142 free any empty string_chars_block we see. */
4139 void 4143 static void
4140 compact_string_chars (void) 4144 compact_string_chars (void)
4141 { 4145 {
4142 struct string_chars_block *to_sb = first_string_chars_block; 4146 struct string_chars_block *to_sb = first_string_chars_block;
4143 int to_pos = 0; 4147 int to_pos = 0;
4144 struct string_chars_block *from_sb; 4148 struct string_chars_block *from_sb;