Merge from emacs--devo--0

[gnu-emacs] / src / sheap.c

diff --git a/src/sheap.c b/src/sheap.c
index cc740173a24bb8b53bd3323197a3ddce5c2b659b..5d54a0edc45f5b8236c596ba5b5b91709b491878 100644 (file)
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -1,13 +1,13 @@
 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
    complete rewrite of xemacs Cygwin `unexec' code
 
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -26,11 +26,7 @@ Boston, MA 02110-1301, USA.  */
 
 #include <unistd.h>
 
-#ifdef HAVE_X_WINDOWS
-#define STATIC_HEAP_SIZE       (8 * 1024 * 1024)
-#else
-#define STATIC_HEAP_SIZE       (8 * 1024 * 1024)
-#endif
+#define STATIC_HEAP_SIZE       (12 * 1024 * 1024)
 
 int debug_sheap = 0;