Mercurial > hg > xemacs-beta
diff src/emacs.c @ 373:6240c7796c7a r21-2b2
Import from CVS: tag r21-2b2
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:04:06 +0200 |
parents | cc15677e0335 |
children | d883f39b8495 |
line wrap: on
line diff
--- a/src/emacs.c Mon Aug 13 11:03:09 2007 +0200 +++ b/src/emacs.c Mon Aug 13 11:04:06 2007 +0200 @@ -612,6 +612,9 @@ #if defined (HAVE_MMAP) && defined (REL_ALLOC) /* ralloc can only be used if using the GNU memory allocator. */ init_ralloc (); +#elif defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC) + if (initialized) + init_ralloc(); #endif #ifdef HAVE_SOCKS @@ -1278,9 +1281,6 @@ vars_of_extents (); vars_of_faces (); vars_of_fileio (); -#ifdef CLASH_DETECTION - vars_of_filelock (); -#endif vars_of_floatfns (); vars_of_font_lock (); vars_of_frame (); @@ -1535,10 +1535,6 @@ might depend on all sorts of things; I'm not sure. */ complex_vars_of_emacs (); -#ifdef CLASH_DETECTION - complex_vars_of_filelock (); -#endif /* CLASH_DETECTION */ - /* This creates a couple of basic keymaps and depends on Lisp hashtables and Ffset() (both of which depend on some variables initialized in the vars_of_*() section) and possibly other