comparison src/emacs.c @ 94:1040fe1366ac xemacs-20-0f2

Import from CVS: tag xemacs-20-0f2
author cvs
date Mon, 13 Aug 2007 09:12:09 +0200
parents 1ce6082ce73f
children 0d2f883870bc
comparison
equal deleted inserted replaced
93:486ff617c2a1 94:1040fe1366ac
61 #include <default_acl.h> 61 #include <default_acl.h>
62 #endif 62 #endif
63 #endif 63 #endif
64 64
65 extern void memory_warnings (void *, void (*warnfun) (CONST char *)); 65 extern void memory_warnings (void *, void (*warnfun) (CONST char *));
66
67 #ifndef SYSTEM_MALLOC
68 extern void *(*__malloc_hook)(size_t);
69 extern void *(*__realloc_hook)(void *, size_t);
70 extern void (*__free_hook)(void *);
71 #endif /* not SYSTEM_MALLOC */
66 72
67 /* Command line args from shell, as list of strings */ 73 /* Command line args from shell, as list of strings */
68 Lisp_Object Vcommand_line_args; 74 Lisp_Object Vcommand_line_args;
69 75
70 /* Set nonzero after XEmacs has started up the first time. 76 /* Set nonzero after XEmacs has started up the first time.
438 { 444 {
439 char stack_bottom_variable; 445 char stack_bottom_variable;
440 int skip_args = 0; 446 int skip_args = 0;
441 Lisp_Object load_me; 447 Lisp_Object load_me;
442 int inhibit_window_system; 448 int inhibit_window_system;
449
450 #ifndef SYSTEM_MALLOC
451 /* Make sure that any libraries we link against haven't installed a
452 hook for a gmalloc of a potentially incompatible version. */
453 __malloc_hook = NULL;
454 __realloc_hook = NULL;
455 __free_hook = NULL;
456 #endif /* not SYSTEM_MALLOC */
443 457
444 noninteractive = 0; 458 noninteractive = 0;
445 459
446 #ifdef NeXT 460 #ifdef NeXT
447 extern int malloc_cookie; 461 extern int malloc_cookie;