From 54655c37cd731e79b794c06d6cb9e791b2204f1d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 30 Nov 2015 18:08:00 +0100
Subject: [PATCH] Create epoll_waiting

---
 input/common/epoll_common.c            | 6 ++++++
 input/common/epoll_common.h            | 2 ++
 input/drivers/udev_input.c             | 2 +-
 input/drivers_joypad/linuxraw_joypad.c | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/input/common/epoll_common.c b/input/common/epoll_common.c
index 3362a5085e..3aa4792383 100644
--- a/input/common/epoll_common.c
+++ b/input/common/epoll_common.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <unistd.h>
 
 #include "epoll_common.h"
 
@@ -33,3 +34,8 @@ void epoll_free(bool is_joypad)
    epoll_inited                 = false;
    epoll_first_inited_is_joypad = false;
 }
+
+int epoll_waiting(struct epoll_event *events, int maxevents, int timeout)
+{
+   return epoll_wait(g_epoll, events, maxevents, timeout);
+}
diff --git a/input/common/epoll_common.h b/input/common/epoll_common.h
index 22a6db6a86..00a6376e84 100644
--- a/input/common/epoll_common.h
+++ b/input/common/epoll_common.h
@@ -29,4 +29,6 @@ bool epoll_new(bool is_joypad);
 
 void epoll_free(bool is_joypad);
 
+int epoll_waiting(struct epoll_event *events, int maxevents, int timeout);
+
 #endif
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 4ecb077a64..52ceebd53d 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -365,7 +365,7 @@ static void udev_input_poll(void *data)
    while (udev_mon_hotplug_available())
       udev_input_handle_hotplug(udev);
 
-   ret = epoll_wait(g_epoll, events, ARRAY_SIZE(events), 0);
+   ret = epoll_waiting(events, ARRAY_SIZE(events), 0);
 
    for (i = 0; i < ret; i++)
    {
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index d21447e12c..ba334d8ff9 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -194,7 +194,7 @@ static void linuxraw_joypad_poll(void)
    struct epoll_event events[MAX_USERS + 1];
 
 retry:
-   ret = epoll_wait(g_epoll, events, MAX_USERS + 1, 0);
+   ret = epoll_waiting(events, MAX_USERS + 1, 0);
    if (ret < 0 && errno == EINTR)
       goto retry;