diff options
| author | Paul Eggert | 2011-11-19 19:07:02 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 19:07:02 -0800 |
| commit | 615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch) | |
| tree | e0458a9eac443c36a3a4bfa117fde01bbd6e4140 /src/alloc.c | |
| parent | c3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff) | |
| parent | e1dbe924b53c541fdf238a5a722b7177d5c8760b (diff) | |
| download | emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip | |
Merge from trunk.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 639a35c3f36..96d63f53cf9 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -876,7 +876,7 @@ safe_alloca_unwind (Lisp_Object arg) | |||
| 876 | 876 | ||
| 877 | /* Like malloc but used for allocating Lisp data. NBYTES is the | 877 | /* Like malloc but used for allocating Lisp data. NBYTES is the |
| 878 | number of bytes to allocate, TYPE describes the intended use of the | 878 | number of bytes to allocate, TYPE describes the intended use of the |
| 879 | allcated memory block (for strings, for conses, ...). */ | 879 | allocated memory block (for strings, for conses, ...). */ |
| 880 | 880 | ||
| 881 | #ifndef USE_LSB_TAG | 881 | #ifndef USE_LSB_TAG |
| 882 | static void *lisp_malloc_loser; | 882 | static void *lisp_malloc_loser; |
| @@ -1406,7 +1406,7 @@ uninterrupt_malloc (void) | |||
| 1406 | #ifdef DOUG_LEA_MALLOC | 1406 | #ifdef DOUG_LEA_MALLOC |
| 1407 | pthread_mutexattr_t attr; | 1407 | pthread_mutexattr_t attr; |
| 1408 | 1408 | ||
| 1409 | /* GLIBC has a faster way to do this, but lets keep it portable. | 1409 | /* GLIBC has a faster way to do this, but let's keep it portable. |
| 1410 | This is according to the Single UNIX Specification. */ | 1410 | This is according to the Single UNIX Specification. */ |
| 1411 | pthread_mutexattr_init (&attr); | 1411 | pthread_mutexattr_init (&attr); |
| 1412 | pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); | 1412 | pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); |