IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bring neovim up to date with recent libuv changes

Browse Source 
As of v0.11.23 libuv's uv_timer_cb, uv_async_cb, uv_prepare_cb, uv_check_cb and
uv_idle_cb no longer require a status parameter (this went unused in the first
place).

Bump third-party dependency `libuv` up to 0.11.23 and remove the extra
parameters from the callbacks.
This commit is contained in:
Will Tange 2014-04-09 11:32:42 +02:00 committed by Thiago de Arruda
parent a881273dad
commit ed73da9f0e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/event.c
View File

@ -20,8 +20,8 @@ KLIST_INIT(Event, Event, _destroy_event)
static klist_t(Event) *event_queue; static klist_t(Event) *event_queue;
static uv_timer_t timer; static uv_timer_t timer;
static uv_prepare_t timer_prepare; static uv_prepare_t timer_prepare;
static void timer_cb(uv_timer_t *handle, int); static void timer_cb(uv_timer_t *handle);
static void timer_prepare_cb(uv_prepare_t *, int); static void timer_prepare_cb(uv_prepare_t *);
void event_init() void event_init()
{ {
@ -119,12 +119,12 @@ void event_process()
} }
// Set a flag in the `event_poll` loop for signaling of a timeout // Set a flag in the `event_poll` loop for signaling of a timeout
static void timer_cb(uv_timer_t *handle, int status) static void timer_cb(uv_timer_t *handle)
{ {
*((bool *)handle->data) = true; *((bool *)handle->data) = true;
} }
static void timer_prepare_cb(uv_prepare_t *handle, int status) static void timer_prepare_cb(uv_prepare_t *handle)
{ {
uv_timer_start(&timer, timer_cb, *(uint32_t *)timer_prepare.data, 0); uv_timer_start(&timer, timer_cb, *(uint32_t *)timer_prepare.data, 0);
uv_prepare_stop(&timer_prepare); uv_prepare_stop(&timer_prepare);

4
src/os/input.c
View File

@ -42,7 +42,7 @@ static InbufPollResult inbuf_poll(int32_t ms);
static void stderr_switch(void); static void stderr_switch(void);
static void alloc_cb(uv_handle_t *, size_t, uv_buf_t *); static void alloc_cb(uv_handle_t *, size_t, uv_buf_t *);
static void read_cb(uv_stream_t *, ssize_t, const uv_buf_t *); static void read_cb(uv_stream_t *, ssize_t, const uv_buf_t *);
static void fread_idle_cb(uv_idle_t *, int); static void fread_idle_cb(uv_idle_t *);
void input_init() void input_init()
{ {
@ -246,7 +246,7 @@ static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf)
} }
// Called by the by the 'idle' handle to emulate a reading event // Called by the by the 'idle' handle to emulate a reading event
static void fread_idle_cb(uv_idle_t *handle, int status) static void fread_idle_cb(uv_idle_t *handle)
{ {
uv_fs_t req; uv_fs_t req;

4
src/os/job.c
View File

@ -55,7 +55,7 @@ static Job * find_job(int id);
static void free_job(Job *job); static void free_job(Job *job);
// Callbacks for libuv // Callbacks for libuv
static void job_prepare_cb(uv_prepare_t *handle, int status); static void job_prepare_cb(uv_prepare_t *handle);
static void alloc_cb(uv_handle_t *handle, size_t suggested, uv_buf_t *buf); static void alloc_cb(uv_handle_t *handle, size_t suggested, uv_buf_t *buf);
static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf); static void read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf);
static void write_cb(uv_write_t *req, int status); static void write_cb(uv_write_t *req, int status);
@ -257,7 +257,7 @@ static void free_job(Job *job)
/// Iterates the table, sending SIGTERM to stopped jobs and SIGKILL to those /// Iterates the table, sending SIGTERM to stopped jobs and SIGKILL to those
/// that didn't die from SIGTERM after a while(exit_timeout is 0). /// that didn't die from SIGTERM after a while(exit_timeout is 0).
static void job_prepare_cb(uv_prepare_t *handle, int status) static void job_prepare_cb(uv_prepare_t *handle)
{ {
Job *job; Job *job;
int i; int i;

4
third-party/CMakeLists.txt vendored
View File

@ -44,8 +44,8 @@ endif()
include(ExternalProject) include(ExternalProject)
set(LIBUV_URL https://github.com/joyent/libuv/archive/v0.11.22.tar.gz) set(LIBUV_URL https://github.com/joyent/libuv/archive/v0.11.23.tar.gz)
set(LIBUV_MD5 d0cb0fea847afa35333ccbda56ed16d4) set(LIBUV_MD5 e02a3da9fba9ebe72a84e4abd312ee4d)
set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-0.5.8/msgpack-0.5.8.tar.gz) set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-0.5.8/msgpack-0.5.8.tar.gz)
set(MSGPACK_MD5 ea0bee0939d2980c0df91f0e4843ccc4) set(MSGPACK_MD5 ea0bee0939d2980c0df91f0e4843ccc4)