aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorJan Djärv2004-12-07 21:03:04 +0000
committerJan Djärv2004-12-07 21:03:04 +0000
commitcf435f39ceb1d6c59d314068e02203b6477f1c2a (patch)
tree3e3c677fbaa4518c21b00859886e8b4b0a9e98a8 /src/emacs.c
parentf415cacdbd53833dff84f8666dcbcb7035fb9320 (diff)
downloademacs-cf435f39ceb1d6c59d314068e02203b6477f1c2a.tar.gz
emacs-cf435f39ceb1d6c59d314068e02203b6477f1c2a.zip
* 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.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index b6b7f986e94..8e2443e8f1f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2238,7 +2238,7 @@ You must run Emacs in batch mode in order to dump it. */)
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. */