comparison src/emacs.c @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1
author cvs
date Mon, 13 Aug 2007 09:13:56 +0200
parents 1040fe1366ac
children 4be1180a9e89
comparison
equal deleted inserted replaced
97:498bf5da1c90 98:0d2f883870bc
444 { 444 {
445 char stack_bottom_variable; 445 char stack_bottom_variable;
446 int skip_args = 0; 446 int skip_args = 0;
447 Lisp_Object load_me; 447 Lisp_Object load_me;
448 int inhibit_window_system; 448 int inhibit_window_system;
449 #ifdef NeXT
450 extern int malloc_cookie;
451 #endif
449 452
450 #ifndef SYSTEM_MALLOC 453 #ifndef SYSTEM_MALLOC
451 /* Make sure that any libraries we link against haven't installed a 454 /* Make sure that any libraries we link against haven't installed a
452 hook for a gmalloc of a potentially incompatible version. */ 455 hook for a gmalloc of a potentially incompatible version. */
453 __malloc_hook = NULL; 456 __malloc_hook = NULL;
456 #endif /* not SYSTEM_MALLOC */ 459 #endif /* not SYSTEM_MALLOC */
457 460
458 noninteractive = 0; 461 noninteractive = 0;
459 462
460 #ifdef NeXT 463 #ifdef NeXT
461 extern int malloc_cookie;
462
463 /* 19-Jun-1995 -baw 464 /* 19-Jun-1995 -baw
464 * NeXT secret magic, ripped from Emacs-for-NS by Carl Edman 465 * NeXT secret magic, ripped from Emacs-for-NS by Carl Edman
465 * <cedman@princeton.edu>. Note that even Carl doesn't know what this 466 * <cedman@princeton.edu>. Note that even Carl doesn't know what this
466 * does; it was provided by NeXT, and it presumable makes NS's mallocator 467 * does; it was provided by NeXT, and it presumable makes NS's mallocator
467 * work with dumping. But malloc_jumpstart() and malloc_freezedry() in 468 * work with dumping. But malloc_jumpstart() and malloc_freezedry() in