# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1186476968 0
# Node ID d004a08e940250b57b53c13f5d0e39a464bda7d2
# Parent  7856255721ef78c6ac5ad133d879791d59a0b412
*** empty log message ***

diff -r 7856255721ef -r d004a08e9402 src/ChangeLog
--- a/src/ChangeLog	Tue Aug 07 08:55:43 2007 +0000
+++ b/src/ChangeLog	Tue Aug 07 08:56:08 2007 +0000
@@ -1,3 +1,16 @@
+2007-08-07  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* emacs.c (main)
+	[HAVE_GTK_AND_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]:
+	Call malloc_enable_thread on interactive startup.
+
+	* gmalloc.c (_malloc_thread_enabled_p) [USE_PTHREAD]: New variable.
+	[USE_PTHREAD] (LOCK, UNLOCK, LOCK_ALIGNED_BLOCKS)
+	(UNLOCK_ALIGNED_BLOCKS): Conditionalize with it.
+	(malloc_atfork_handler_prepare, malloc_atfork_handler_parent)
+	(malloc_atfork_handler_child, malloc_enable_thread) [USE_PTHREAD]:
+	New functions.
+
 2007-08-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (redisplay_window): When restoring original buffer