diff options
| author | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-10-30 19:41:18 +0100 |
| commit | d998d08c964804d9facd7b05c8429fcb8fab7f59 (patch) | |
| tree | 3a82584781b80219f0b46b02d8d6c06e4a3b1e88 /erts/emulator/beam/erl_io_queue.c | |
| parent | bdd21517a65aa13393c8e97a89e3c9127f99c273 (diff) | |
| parent | 1b00539d6db8e349c6782bcd38ab006420734106 (diff) | |
| download | otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.gz otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.tar.bz2 otp-d998d08c964804d9facd7b05c8429fcb8fab7f59.zip | |
Merge branch 'lukas/erts/misc_fixes'
* lukas/erts/misc_fixes:
erts: Fix a bunch of compiler warnings
kernel: Fix gen_tcp_misc indentation
erts: Fail port_SUITE:huge_env if error code > 127
erts: Add lcnt prototype for dist locks update
Diffstat (limited to 'erts/emulator/beam/erl_io_queue.c')
| -rw-r--r-- | erts/emulator/beam/erl_io_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_io_queue.c b/erts/emulator/beam/erl_io_queue.c index 190ba6bbb9..40d69ea6b0 100644 --- a/erts/emulator/beam/erl_io_queue.c +++ b/erts/emulator/beam/erl_io_queue.c @@ -658,7 +658,7 @@ io_list_vec_count(Eterm obj, Uint *v_size, int erts_ioq_iolist_vec_len(Eterm obj, int* vsize, Uint* csize, Uint* pvsize, Uint* pcsize, - Uint* total_size, Uint blimit) + size_t* total_size, Uint blimit) { DECLARE_ESTACK(s); Eterm* objp; @@ -669,7 +669,7 @@ erts_ioq_iolist_vec_len(Eterm obj, int* vsize, Uint* csize, Uint p_v_size = 0; Uint p_c_size = 0; Uint p_in_clist = 0; - Uint total; + size_t total; goto L_jump_start; /* avoid a push */ |