diff options
author | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-01-28 11:06:43 +0100 |
commit | bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861 (patch) | |
tree | 94dae2ff490c4193df939fc85927ac63af9542e1 /erts/emulator/beam/erl_vm.h | |
parent | 75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (diff) | |
parent | 2b57228dd5993321a217a89dbe601d1e90b18f33 (diff) | |
download | otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.gz otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.tar.bz2 otp-bb5b33bd3a7c8cbb97695c00f4b9b0d89121f861.zip |
Merge branch 'master' of super:otp
Diffstat (limited to 'erts/emulator/beam/erl_vm.h')
-rw-r--r-- | erts/emulator/beam/erl_vm.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h index 337422eead..b7de8208ad 100644 --- a/erts/emulator/beam/erl_vm.h +++ b/erts/emulator/beam/erl_vm.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2013. All Rights Reserved. + * Copyright Ericsson AB 1996-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -46,7 +46,6 @@ heap data on the C stack or if we use the buffers in the scheduler data. */ #define TMP_HEAP_SIZE 128 /* Number of Eterm in the schedulers small heap for transient heap data */ -#define CMP_TMP_HEAP_SIZE 32 /* cmp wants its own tmp-heap... */ #define ERL_ARITH_TMP_HEAP_SIZE 4 /* as does erl_arith... */ #define BEAM_EMU_TMP_HEAP_SIZE 2 /* and beam_emu... */ |