martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* emacs.c (Fdump_emacs): Add ! defined (SYSTEM_MALLOC) around

Browse Source 
reset_malloc_hooks.

* keyboard.c (handle_async_input, input_available_signal): Add
! defined (SYSTEM_MALLOC) around thread code.
This commit is contained in:
Jan Djärv
2004-12-07 21:03:04 +00:00
parent f415cacdbd
commit cf435f39ce
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@@ -1,5 +1,11 @@
2004-12-07 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* 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.
* alloc.c: Add comment about the reason for (UN)BLOCK_INPUT_ALLOC.
2004-12-07 Stefan <monnier@iro.umontreal.ca>

2
src/emacs.c
View File

@@ -2238,7 +2238,7 @@ You must run Emacs in batch mode in order to dump it. */)
memory_warnings (my_edata, malloc_warning);
#endif /* not WINDOWSNT */
#endif
#ifdef HAVE_GTK_AND_PTHREAD
#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
/* Pthread may call malloc before main, and then we will get an endless
loop, because pthread_self (see alloc.c) calls malloc the first time
it is called on some systems. */

4
src/keyboard.c
View File

@@ -6780,7 +6780,7 @@ handle_async_input ()
#ifdef BSD4_1
extern int select_alarmed;
#endif
#ifdef HAVE_GTK_AND_PTHREAD
#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
extern pthread_t main_thread;
if (pthread_self () != main_thread)
{
@@ -6826,7 +6826,7 @@ input_available_signal (signo)
{
/* Must preserve main program's value of errno. */
int old_errno = errno;
#ifdef HAVE_GTK_AND_PTHREAD
#if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
extern pthread_t main_thread;
if (pthread_self () != main_thread)
{