Mercurial > emacs
comparison src/emacs.c @ 58832:9f7c2511d457
* emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around
reset_malloc_hooks.
* keyboard.c (handle_async_input, input_available_signal): Add
! defined (SYSTEM_MALLOC) around thread code.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 07 Dec 2004 21:03:04 +0000 |
| parents | f8cddae7d959 |
| children | 4406d551c5c6 5e454dd0d649 f2ebccfa87d4 |
comparison
equal
deleted
inserted
replaced
| 58831:408c5135b0a2 | 58832:9f7c2511d457 |
|---|---|
| 2236 /* On Windows, this was done before dumping, and that once suffices. | 2236 /* On Windows, this was done before dumping, and that once suffices. |
| 2237 Meanwhile, my_edata is not valid on Windows. */ | 2237 Meanwhile, my_edata is not valid on Windows. */ |
| 2238 memory_warnings (my_edata, malloc_warning); | 2238 memory_warnings (my_edata, malloc_warning); |
| 2239 #endif /* not WINDOWSNT */ | 2239 #endif /* not WINDOWSNT */ |
| 2240 #endif | 2240 #endif |
| 2241 #ifdef HAVE_GTK_AND_PTHREAD | 2241 #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) |
| 2242 /* Pthread may call malloc before main, and then we will get an endless | 2242 /* Pthread may call malloc before main, and then we will get an endless |
| 2243 loop, because pthread_self (see alloc.c) calls malloc the first time | 2243 loop, because pthread_self (see alloc.c) calls malloc the first time |
| 2244 it is called on some systems. */ | 2244 it is called on some systems. */ |
| 2245 reset_malloc_hooks (); | 2245 reset_malloc_hooks (); |
| 2246 #endif | 2246 #endif |