Mercurial > emacs
comparison src/emacs.c @ 83232:5e454dd0d649
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-717
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-718
RCS keyword removal
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-719
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-272
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 08 Dec 2004 22:21:07 +0000 |
parents | 549734260e34 9f7c2511d457 |
children | 4ee39d9428b0 |
comparison
equal
deleted
inserted
replaced
83231:549734260e34 | 83232:5e454dd0d649 |
---|---|
2235 /* On Windows, this was done before dumping, and that once suffices. | 2235 /* On Windows, this was done before dumping, and that once suffices. |
2236 Meanwhile, my_edata is not valid on Windows. */ | 2236 Meanwhile, my_edata is not valid on Windows. */ |
2237 memory_warnings (my_edata, malloc_warning); | 2237 memory_warnings (my_edata, malloc_warning); |
2238 #endif /* not WINDOWSNT */ | 2238 #endif /* not WINDOWSNT */ |
2239 #endif | 2239 #endif |
2240 #ifdef HAVE_GTK_AND_PTHREAD | 2240 #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD) |
2241 /* Pthread may call malloc before main, and then we will get an endless | 2241 /* Pthread may call malloc before main, and then we will get an endless |
2242 loop, because pthread_self (see alloc.c) calls malloc the first time | 2242 loop, because pthread_self (see alloc.c) calls malloc the first time |
2243 it is called on some systems. */ | 2243 it is called on some systems. */ |
2244 reset_malloc_hooks (); | 2244 reset_malloc_hooks (); |
2245 #endif | 2245 #endif |