build: Remove compat helper for ppoll

4 files changed, 1 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index ba76ee5dc..d258f866a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -278,7 +278,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
 			src/sdp-client.h src/sdp-client.c \
 			src/textfile.h src/textfile.c \
 			src/glib-helper.h src/glib-helper.c \
-			src/uinput.h src/ppoll.h \
+			src/uinput.h \
 			src/plugin.h src/plugin.c \
 			src/storage.h src/storage.c \
 			src/agent.h src/agent.c \
diff --git a/acinclude.m4 b/acinclude.m4
index 39c57c26d..3a2b54e84 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -26,11 +26,6 @@ AC_DEFUN([COMPILER_FLAGS], [
 	AC_SUBST([WARNING_CFLAGS], $with_cflags)
 ])
 
-AC_DEFUN([AC_FUNC_PPOLL], [
-	AC_CHECK_FUNC(ppoll, dummy=yes, AC_DEFINE(NEED_PPOLL, 1,
-			[Define to 1 if you need the ppoll() function.]))
-])
-
 AC_DEFUN([AC_INIT_BLUEZ], [
 	AC_PREFIX_DEFAULT(/usr/local)
 
diff --git a/configure.ac b/configure.ac
index 48e28179e..6359f3ce8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,6 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-AC_FUNC_PPOLL
-
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
 			AC_MSG_ERROR(dynamic linking loader is required))
 
diff --git a/src/ppoll.h b/src/ppoll.h
deleted file mode 100644
index 7d09d44d9..000000000
--- a/src/ppoll.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef ppoll
-#undef ppoll
-#endif
-
-#define ppoll compat_ppoll
-
-static inline int compat_ppoll(struct pollfd *fds, nfds_t nfds,
-		const struct timespec *timeout, const sigset_t *sigmask)
-{
-	if (timeout == NULL)
-		return poll(fds, nfds, -1);
-	else if (timeout->tv_sec == 0)
-		return poll(fds, nfds, 500);
-	else
-		return poll(fds, nfds, timeout->tv_sec * 1000);
-}