aboutsummaryrefslogtreecommitdiff
path: root/src/os/event.c
diff options
context:
space:
mode:
authorWill Tange <bh34rt@gmail.com>2014-04-09 11:32:42 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-14 12:59:55 -0300
commited73da9f0ec532a38f74501985db4bd5c60e5b9d (patch)
treee34dbdc1641a53a53e5b3ff4d2d1037ca6a2b756 /src/os/event.c
parenta881273dad5eb5d1f5efa8da79704c9cf9abf0e0 (diff)
downloadrneovim-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/os/event.c')
-rw-r--r--src/os/event.c8
1 files changed, 4 insertions, 4 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);