diff options
| author | Henrik Nord <[email protected]> | 2013-12-02 15:49:58 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2013-12-02 15:50:01 +0100 |
| commit | 87054d91f9cb191274a56ac80a8ab29c4cb3a0ef (patch) | |
| tree | 4e2e9dc83a55f5a0621d4790c181d56ca35a9bc5 /erts/emulator/beam/erl_alloc_util.c | |
| parent | 3e7d99747edeb7b22f8c6cea937cdd830613dcad (diff) | |
| parent | 80f95d2ab4352eef90ae2546a8e42f4ed82cd738 (diff) | |
| download | otp-87054d91f9cb191274a56ac80a8ab29c4cb3a0ef.tar.gz otp-87054d91f9cb191274a56ac80a8ab29c4cb3a0ef.tar.bz2 otp-87054d91f9cb191274a56ac80a8ab29c4cb3a0ef.zip | |
Merge branch 'nox/fix-clang-warnings' into maint
* nox/fix-clang-warnings:
Silence warnings about socklen_t pointers sign in erl_memory
Compile in_heapfrag() only in debug mode
Silence two warnings about tests being always true
Conditionally compile my_gethostbyname_r and my_gethostbyaddr_r
Silence a mismatching type pointer warning in ei_resolve
Silence warnings about different buffer types in erl_memory
erts: Remove unused file winsock_func.h
Silence warnings about unused return values in ic
Silence a warning in erl_poll about an empty loop body
Fix erts_check_off_heap2 assertion
Properly mark erl_assert_error as non-returning
Remove uninitialized use of new_crr in erl_alloc_util
OTP-11517
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c index 3914537d0d..c6cea0185f 100644 --- a/erts/emulator/beam/erl_alloc_util.c +++ b/erts/emulator/beam/erl_alloc_util.c @@ -3570,7 +3570,6 @@ resize_carrier(Allctr_t *allctr, Block_t *old_blk, Uint umem_sz, UWord flags) /* Old carrier unchanged; restore... */ STAT_SYS_ALLOC_SBC_ALLOC(allctr, old_crr_sz, old_blk_sz); } - DEBUG_SAVE_ALIGNMENT(new_crr); return new_blk; } #endif |