diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-11-05 01:03:44 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-03-29 10:08:42 +0300 |
| commit | 4bcee963471abd939bb9edd1709418e30be7290f (patch) | |
| tree | ed4d8ef5d4526b538a2f6113c3f0fce28c94c2fe /src/nvim/event | |
| parent | 9ed9af7e11e3a707f65abfeb1d02b029e39241ea (diff) | |
| download | rneovim-4bcee963471abd939bb9edd1709418e30be7290f.tar.gz rneovim-4bcee963471abd939bb9edd1709418e30be7290f.tar.bz2 rneovim-4bcee963471abd939bb9edd1709418e30be7290f.zip | |
*: Fix some Windows-specific warnings
Also fixed an error in path_fnamecmp().
Diffstat (limited to 'src/nvim/event')
| -rw-r--r-- | src/nvim/event/rstream.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c index 92efc9fa2e..2737dad305 100644 --- a/src/nvim/event/rstream.c +++ b/src/nvim/event/rstream.c @@ -89,7 +89,10 @@ static void on_rbuffer_nonfull(RBuffer *buf, void *data) static void alloc_cb(uv_handle_t *handle, size_t suggested, uv_buf_t *buf) { Stream *stream = handle->data; - buf->base = rbuffer_write_ptr(stream->buffer, &buf->len); + // `uv_buf_t.len` happens to have different size on Windows. + size_t write_count; + buf->base = rbuffer_write_ptr(stream->buffer, &write_count); + buf->len = write_count; } // Callback invoked by libuv after it copies the data into the buffer provided @@ -136,7 +139,10 @@ static void fread_idle_cb(uv_idle_t *handle) uv_fs_t req; Stream *stream = handle->data; - stream->uvbuf.base = rbuffer_write_ptr(stream->buffer, &stream->uvbuf.len); + // `uv_buf_t.len` happens to have different size on Windows. + size_t write_count; + stream->uvbuf.base = rbuffer_write_ptr(stream->buffer, &write_count); + stream->uvbuf.len = write_count; // the offset argument to uv_fs_read is int64_t, could someone really try // to read more than 9 quintillion (9e18) bytes? |