comparison src/emacs.c @ 314:341dac730539 r21-0b55

Import from CVS: tag r21-0b55
author cvs
date Mon, 13 Aug 2007 10:44:22 +0200
parents 70ad99077275
children 19dcec799385
comparison
equal deleted inserted replaced
313:2905de29931f 314:341dac730539
610 #endif /* APOLLO */ 610 #endif /* APOLLO */
611 611
612 #if defined (HAVE_MMAP) && defined (REL_ALLOC) 612 #if defined (HAVE_MMAP) && defined (REL_ALLOC)
613 /* ralloc can only be used if using the GNU memory allocator. */ 613 /* ralloc can only be used if using the GNU memory allocator. */
614 init_ralloc (); 614 init_ralloc ();
615 #elif defined (REL_ALLOC) && !defined(DOUG_LEA_MALLOC)
616 if (initialized)
617 init_ralloc();
615 #endif 618 #endif
616 619
617 #ifdef HAVE_SOCKS 620 #ifdef HAVE_SOCKS
618 if (initialized) 621 if (initialized)
619 SOCKSinit (argv[0]); 622 SOCKSinit (argv[0]);