diff options
| author | Rickard Green <[email protected]> | 2010-12-17 10:47:50 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-12-17 10:47:50 +0100 |
| commit | 9cd4cf6ff49d97756f620f6cc43824ac642b96a9 (patch) | |
| tree | e85227a149d9f1c577d4d9ae12ee257c9687fb0a /erts/emulator/beam/erl_alloc.c | |
| parent | 3f514f4b5f37ab3a5bf5656cf642e58b1e7c20bb (diff) | |
| parent | 5c2c753281f5d26978ac4f56e9280f82a6cc3bbc (diff) | |
| download | otp-9cd4cf6ff49d97756f620f6cc43824ac642b96a9.tar.gz otp-9cd4cf6ff49d97756f620f6cc43824ac642b96a9.tar.bz2 otp-9cd4cf6ff49d97756f620f6cc43824ac642b96a9.zip | |
Merge branch 'rickard/fix-warnings/R14B02' into dev
* rickard/fix-warnings/R14B02:
Remove unused variable
Remove stray semicolons in erl_term.h
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index 7793f60f4f..e85e2d7e3f 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1568,7 +1568,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg) Eterm atoms[sizeof(size)/sizeof(Uint)]; Uint *uintps[sizeof(size)/sizeof(Uint)]; Eterm euints[sizeof(size)/sizeof(Uint)]; - int need_atom; int want_tot_or_sys; int length; Eterm res = THE_NON_VALUE; @@ -1756,7 +1755,6 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg) /* Calculate values needed... */ want_tot_or_sys = want.total || want.system; - need_atom = ERTS_MEM_NEED_ALL_ALCU || want.atom; if (ERTS_MEM_NEED_ALL_ALCU) { size.total = 0; |