diff options
| author | Joakim Verona | 2013-01-24 00:03:29 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-01-24 00:03:29 +0100 |
| commit | e4963dc9795ed5a3eb60e73943b9d799107e0f13 (patch) | |
| tree | 29372c728b8468e618623bb660cda24848f10063 /src/alloc.c | |
| parent | 6f0e40ae28faeba85872002eb848debb6bfcb2f5 (diff) | |
| parent | b09cca6ace3728ad8a93b3c0301520fa75e71586 (diff) | |
| download | emacs-e4963dc9795ed5a3eb60e73943b9d799107e0f13.tar.gz emacs-e4963dc9795ed5a3eb60e73943b9d799107e0f13.zip | |
auto upstream
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/alloc.c b/src/alloc.c index a2e7282bb60..2624650ed2c 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -26,7 +26,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 26 | #include <limits.h> /* For CHAR_BIT. */ | 26 | #include <limits.h> /* For CHAR_BIT. */ |
| 27 | 27 | ||
| 28 | #ifdef ENABLE_CHECKING | 28 | #ifdef ENABLE_CHECKING |
| 29 | #include <signal.h> /* For SIGABRT. */ | 29 | #include <signal.h> /* For SIGABRT. */ |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #ifdef HAVE_PTHREAD | 32 | #ifdef HAVE_PTHREAD |
| @@ -1684,7 +1684,7 @@ allocate_string_data (struct Lisp_String *s, | |||
| 1684 | b = lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP); | 1684 | b = lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP); |
| 1685 | 1685 | ||
| 1686 | #ifdef DOUG_LEA_MALLOC | 1686 | #ifdef DOUG_LEA_MALLOC |
| 1687 | /* Back to a reasonable maximum of mmap'ed areas. */ | 1687 | /* Back to a reasonable maximum of mmap'ed areas. */ |
| 1688 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); | 1688 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); |
| 1689 | #endif | 1689 | #endif |
| 1690 | 1690 | ||
| @@ -1901,7 +1901,7 @@ compact_small_strings (void) | |||
| 1901 | 1901 | ||
| 1902 | #ifdef GC_CHECK_STRING_BYTES | 1902 | #ifdef GC_CHECK_STRING_BYTES |
| 1903 | /* Check that the string size recorded in the string is the | 1903 | /* Check that the string size recorded in the string is the |
| 1904 | same as the one recorded in the sdata structure. */ | 1904 | same as the one recorded in the sdata structure. */ |
| 1905 | if (s && string_bytes (s) != SDATA_NBYTES (from)) | 1905 | if (s && string_bytes (s) != SDATA_NBYTES (from)) |
| 1906 | emacs_abort (); | 1906 | emacs_abort (); |
| 1907 | #endif /* GC_CHECK_STRING_BYTES */ | 1907 | #endif /* GC_CHECK_STRING_BYTES */ |
| @@ -6564,7 +6564,7 @@ die (const char *msg, const char *file, int line) | |||
| 6564 | } | 6564 | } |
| 6565 | #endif | 6565 | #endif |
| 6566 | 6566 | ||
| 6567 | /* Initialization */ | 6567 | /* Initialization. */ |
| 6568 | 6568 | ||
| 6569 | void | 6569 | void |
| 6570 | init_alloc_once (void) | 6570 | init_alloc_once (void) |
| @@ -6579,9 +6579,9 @@ init_alloc_once (void) | |||
| 6579 | #endif | 6579 | #endif |
| 6580 | 6580 | ||
| 6581 | #ifdef DOUG_LEA_MALLOC | 6581 | #ifdef DOUG_LEA_MALLOC |
| 6582 | mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */ | 6582 | mallopt (M_TRIM_THRESHOLD, 128 * 1024); /* Trim threshold. */ |
| 6583 | mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */ | 6583 | mallopt (M_MMAP_THRESHOLD, 64 * 1024); /* Mmap threshold. */ |
| 6584 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); /* max. number of mmap'ed areas */ | 6584 | mallopt (M_MMAP_MAX, MMAP_MAX_AREAS); /* Max. number of mmap'ed areas. */ |
| 6585 | #endif | 6585 | #endif |
| 6586 | init_strings (); | 6586 | init_strings (); |
| 6587 | init_vectors (); | 6587 | init_vectors (); |