diff options
| author | Miles Bader <miles@gnu.org> | 2008-04-23 05:55:42 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-04-23 05:55:42 +0000 |
| commit | a113b3ca322fd73d97d0d9d69c9f48dc13fb326a (patch) | |
| tree | 37b3ad22a198a83f68738ef86aec187bb6d926d9 /src/alloc.c | |
| parent | e96a8d6dc0ffc35cf6c02924de2453c69fa8f6fe (diff) | |
| parent | 81fe843b5a3cc7708e0800aeb5bc0dbe448e800a (diff) | |
| download | emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.tar.gz emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.tar.bz2 emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c index fe37eec9379..64c8cc8264e 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -1366,6 +1366,7 @@ void uninterrupt_malloc () { #ifdef HAVE_GTK_AND_PTHREAD +#ifdef DOUG_LEA_MALLOC pthread_mutexattr_t attr; /* GLIBC has a faster way to do this, but lets keep it portable. @@ -1373,6 +1374,11 @@ uninterrupt_malloc () pthread_mutexattr_init (&attr); pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init (&alloc_mutex, &attr); +#else /* !DOUG_LEA_MALLOC */ + /* Some systems such as Solaris 2.6 doesn't have a recursive mutex, + and the bundled gmalloc.c doesn't require it. */ + pthread_mutex_init (&alloc_mutex, NULL); +#endif /* !DOUG_LEA_MALLOC */ #endif /* HAVE_GTK_AND_PTHREAD */ if (__free_hook != emacs_blocked_free) |