/[emacs]/emacs/src/alloc.c
ViewVC logotype

Diff of /emacs/src/alloc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.361 by monnier, Tue Jan 4 20:22:41 2005 UTC revision 1.362 by kfstorm, Thu Jan 6 22:02:32 2005 UTC
# Line 309  static void mark_glyph_matrix P_ ((struc Line 309  static void mark_glyph_matrix P_ ((struc
309  static void mark_face_cache P_ ((struct face_cache *));  static void mark_face_cache P_ ((struct face_cache *));
310    
311  #ifdef HAVE_WINDOW_SYSTEM  #ifdef HAVE_WINDOW_SYSTEM
312    extern void mark_fringe_data P_ ((void));
313  static void mark_image P_ ((struct image *));  static void mark_image P_ ((struct image *));
314  static void mark_image_cache P_ ((struct frame *));  static void mark_image_cache P_ ((struct frame *));
315  #endif /* HAVE_WINDOW_SYSTEM */  #endif /* HAVE_WINDOW_SYSTEM */
# Line 704  overrun_check_free (block) Line 705  overrun_check_free (block)
705                  val + osize,                  val + osize,
706                  XMALLOC_OVERRUN_CHECK_SIZE))                  XMALLOC_OVERRUN_CHECK_SIZE))
707          abort ();          abort ();
708    #ifdef XMALLOC_CLEAR_FREE_MEMORY
709          val -= XMALLOC_OVERRUN_CHECK_SIZE;
710          memset (val, 0xff, osize + XMALLOC_OVERRUN_CHECK_SIZE*2);
711    #else
712        bzero (val + osize, XMALLOC_OVERRUN_CHECK_SIZE);        bzero (val + osize, XMALLOC_OVERRUN_CHECK_SIZE);
713        val -= XMALLOC_OVERRUN_CHECK_SIZE;        val -= XMALLOC_OVERRUN_CHECK_SIZE;
714        bzero (val, XMALLOC_OVERRUN_CHECK_SIZE);        bzero (val, XMALLOC_OVERRUN_CHECK_SIZE);
715    #endif
716      }      }
717    
718    free (val);    free (val);
# Line 4799  returns nil, because real GC can't be do Line 4805  returns nil, because real GC can't be do
4805      }      }
4806    mark_backtrace ();    mark_backtrace ();
4807    
4808    #ifdef HAVE_WINDOW_SYSTEM
4809      mark_fringe_data ();
4810    #endif
4811    
4812  #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES  #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
4813    mark_stack ();    mark_stack ();
4814  #endif  #endif

Legend:
Removed from v.1.361  
changed lines
  Added in v.1.362

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26