diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/sheap.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/sheap.c')
| -rw-r--r-- | src/sheap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/sheap.c b/src/sheap.c index f8eec753268..54eef60c27d 100644 --- a/src/sheap.c +++ b/src/sheap.c | |||
| @@ -25,7 +25,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 25 | 25 | ||
| 26 | #include <unistd.h> | 26 | #include <unistd.h> |
| 27 | 27 | ||
| 28 | #ifdef __x86_64__ | ||
| 29 | #define STATIC_HEAP_SIZE (18 * 1024 * 1024) | ||
| 30 | #else | ||
| 28 | #define STATIC_HEAP_SIZE (13 * 1024 * 1024) | 31 | #define STATIC_HEAP_SIZE (13 * 1024 * 1024) |
| 32 | #endif | ||
| 29 | 33 | ||
| 30 | int debug_sheap = 0; | 34 | int debug_sheap = 0; |
| 31 | 35 | ||