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

Diff of /emacs/src/emacs.c

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

revision 1.351 by jhd, Tue Dec 7 21:03:04 2004 UTC revision 1.352 by monnier, Sat Dec 11 21:53:33 2004 UTC
# Line 1023  main (argc, argv Line 1023  main (argc, argv
1023       Also call realloc and free for consistency.  */       Also call realloc and free for consistency.  */
1024    free (realloc (malloc (4), 4));    free (realloc (malloc (4), 4));
1025    
1026    # ifndef SYNC_INPUT
1027    /* Arrange to disable interrupt input inside malloc etc.  */    /* Arrange to disable interrupt input inside malloc etc.  */
1028    uninterrupt_malloc ();    uninterrupt_malloc ();
1029    # endif /* not SYNC_INPUT */
1030  #endif  /* not SYSTEM_MALLOC */  #endif  /* not SYSTEM_MALLOC */
1031    
1032  #if defined (MSDOS) || defined (WINDOWSNT)  #if defined (MSDOS) || defined (WINDOWSNT)
# Line 2238  You must run Emacs in batch mode in orde Line 2240  You must run Emacs in batch mode in orde
2240    memory_warnings (my_edata, malloc_warning);    memory_warnings (my_edata, malloc_warning);
2241  #endif /* not WINDOWSNT */  #endif /* not WINDOWSNT */
2242  #endif  #endif
2243  #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)  #if !defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) && !defined SYNC_INPUT
2244    /* Pthread may call malloc before main, and then we will get an endless    /* Pthread may call malloc before main, and then we will get an endless
2245       loop, because pthread_self (see alloc.c) calls malloc the first time       loop, because pthread_self (see alloc.c) calls malloc the first time
2246       it is called on some systems.  */       it is called on some systems.  */

Legend:
Removed from v.1.351  
changed lines
  Added in v.1.352

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