aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorKaroly Lorentey2006-10-14 18:40:58 +0000
committerKaroly Lorentey2006-10-14 18:40:58 +0000
commit5665a02fd1d009506f246d5f77896e3995127954 (patch)
tree08c2fb58aa103aa0f49a7b365ecc85a03a6f0d8b /src/alloc.c
parent12b6af5c7ed2cfdb9783312bf890cf1e6c80c67a (diff)
downloademacs-5665a02fd1d009506f246d5f77896e3995127954.tar.gz
emacs-5665a02fd1d009506f246d5f77896e3995127954.zip
Fix obvious runtime errors after merge.
* lisp/term/x-win.el (x-initialize-window-system): Make a copy of pure list. * src/puresize.h (BASE_PURESIZE): Increase puresize. * src/alloc.c (emacs_blocked_malloc): Disable mallopt call. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-583
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 5cfcda2e1e0..2f186fd3d12 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1238,7 +1238,8 @@ emacs_blocked_malloc (size, ptr)
1238 BLOCK_INPUT_ALLOC; 1238 BLOCK_INPUT_ALLOC;
1239 __malloc_hook = old_malloc_hook; 1239 __malloc_hook = old_malloc_hook;
1240#ifdef DOUG_LEA_MALLOC 1240#ifdef DOUG_LEA_MALLOC
1241 mallopt (M_TOP_PAD, malloc_hysteresis * 4096); 1241 /* Segfaults on my system. --lorentey */
1242 /* mallopt (M_TOP_PAD, malloc_hysteresis * 4096); */
1242#else 1243#else
1243 __malloc_extra_blocks = malloc_hysteresis; 1244 __malloc_extra_blocks = malloc_hysteresis;
1244#endif 1245#endif