aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2013-12-02 15:49:58 +0100
committerHenrik Nord <[email protected]>2013-12-02 15:50:01 +0100
commit87054d91f9cb191274a56ac80a8ab29c4cb3a0ef (patch)
tree4e2e9dc83a55f5a0621d4790c181d56ca35a9bc5 /erts/emulator/sys
parent3e7d99747edeb7b22f8c6cea937cdd830613dcad (diff)
parent80f95d2ab4352eef90ae2546a8e42f4ed82cd738 (diff)
downloadotp-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/sys')
-rw-r--r--erts/emulator/sys/common/erl_poll.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 7676d8872a..0a58a625b2 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -2510,7 +2510,8 @@ ERTS_POLL_EXPORT(erts_poll_destroy_pollset)(ErtsPollSet ps)
pollsets = pollsets->next;
else {
ErtsPollSet prev_ps;
- for (prev_ps = pollsets; ps != prev_ps->next; prev_ps = prev_ps->next);
+ for (prev_ps = pollsets; ps != prev_ps->next; prev_ps = prev_ps->next)
+ ;
ASSERT(ps == prev_ps->next);
prev_ps->next = ps->next;
}