aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-03-25 16:54:15 +0100
committerSverker Eriksson <[email protected]>2014-03-25 16:54:15 +0100
commit6d863e5ffe35aeb1197e3db13df32e1bdce085bb (patch)
tree97c411278923d492341e61a3d719e0cad1bb51fb
parentec398c4cab329a599d558440800f0d7e6ca14a27 (diff)
parent64ffc509c5069e29c5d172dfcad6655efbeafd9b (diff)
downloadotp-6d863e5ffe35aeb1197e3db13df32e1bdce085bb.tar.gz
otp-6d863e5ffe35aeb1197e3db13df32e1bdce085bb.tar.bz2
otp-6d863e5ffe35aeb1197e3db13df32e1bdce085bb.zip
Merge branch 'sverk/win-warning-io'
* sverk/win-warning-io: erts: Fix compile warning in io.c for windows
-rw-r--r--erts/emulator/beam/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index a25716b9b4..edf4a28784 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -914,8 +914,8 @@ int erts_port_handle_xports(Port *prt)
(iov)->iov_base = (ptr); \
(iov)->iov_len = (len); \
if (sizeof((iov)->iov_len) < sizeof(len) \
- /* Check if (len) overflowed (iov)->iov_len */ \
- && ((len) >> (sizeof((iov)->iov_len)*CHAR_BIT)) != 0) { \
+ /* Check if (len) overflowed (iov)->iov_len */ \
+ && (iov)->iov_len != (len)) { \
goto L_overflow; \
} \
*(bv)++ = (bin); \