diff options
| author | Will Tange <bh34rt@gmail.com> | 2014-04-09 11:32:42 +0200 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-14 12:59:55 -0300 |
| commit | ed73da9f0ec532a38f74501985db4bd5c60e5b9d (patch) | |
| tree | e34dbdc1641a53a53e5b3ff4d2d1037ca6a2b756 /src | |
| parent | a881273dad5eb5d1f5efa8da79704c9cf9abf0e0 (diff) | |
| download | rneovim-ed73da9f0ec532a38f74501985db4bd5c60e5b9d.tar.gz rneovim-ed73da9f0ec532a38f74501985db4bd5c60e5b9d.tar.bz2 rneovim-ed73da9f0ec532a38f74501985db4bd5c60e5b9d.zip | |
Bring neovim up to date with recent libuv changes
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/event.c | 8 | ||||
| -rw-r--r-- | src/os/input.c | 4 | ||||
| -rw-r--r-- | src/os/job.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/os/event.c b/src/os/event.c index 7fc374e40e..c96cc692c7 100644 --- a/src/os/event.c +++ b/src/os/event.c @@ -20,8 +20,8 @@ KLIST_INIT(Event, Event, _destroy_event) static klist_t(Event) *event_queue; static uv_timer_t timer; static uv_prepare_t timer_prepare; -static void timer_cb(uv_timer_t *handle, int); -static void timer_prepare_cb(uv_prepare_t *, int); +static void timer_cb(uv_timer_t *handle); +static void timer_prepare_cb(uv_prepare_t *); void event_init() { @@ -119,12 +119,12 @@ void event_process() } // 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; } -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_prepare_stop(&timer_prepare); diff --git a/src/os/input.c b/src/os/input.c index ce1dd69fc0..6f44df166f 100644 --- a/src/os/input.c +++ b/src/os/input.c @@ -42,7 +42,7 @@ static InbufPollResult inbuf_poll(int32_t ms); static void stderr_switch(void); 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 fread_idle_cb(uv_idle_t *, int); +static void fread_idle_cb(uv_idle_t *); 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 -static void fread_idle_cb(uv_idle_t *handle, int status) +static void fread_idle_cb(uv_idle_t *handle) { uv_fs_t req; diff --git a/src/os/job.c b/src/os/job.c index 3a6af7ba92..0d62940013 100644 --- a/src/os/job.c +++ b/src/os/job.c @@ -55,7 +55,7 @@ static Job * find_job(int id); static void free_job(Job *job); // 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 read_cb(uv_stream_t *stream, ssize_t cnt, const uv_buf_t *buf); 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 /// 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; int i; |