Mercurial > emacs

diff src/emacs.c @ 91005:424b655804ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 846-851) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 88-92) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 242-244) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
author Miles Bader <miles@gnu.org>
date Mon, 13 Aug 2007 13:48:35 +0000
parents f55f9811f5d7 3a38f5a481f0
children aaccdab0ee26
line wrap: on
line diff
--- a/src/emacs.c	Wed Aug 08 16:39:00 2007 +0000
+++ b/src/emacs.c	Mon Aug 13 13:48:35 2007 +0000
@@ -1167,6 +1167,13 @@
       setpgrp ();
 #endif
 #endif
+#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
+      {
+	extern void malloc_enable_thread P_ ((void));
+
+	malloc_enable_thread ();
+      }
+#endif
     }
 
   init_signals ();