summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2007-10-03 14:41:21 +0000
committerPierre Ossman <ossman@cendio.se>2007-10-03 14:41:21 +0000
commitef8812e89bb867f127813e1b193589a52f0f2073 (patch)
tree20dfdd766bc48d90ebd5202815985ecbcf6df199
parent7c1768d4d1a61b998811c5044e16525b05cd88b0 (diff)
Replace all references to sys/poll.h with poll.h as that's what POSIX defines.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1925 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--configure.ac5
-rw-r--r--src/pulse/mainloop.c4
-rw-r--r--src/pulse/thread-mainloop.c4
3 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 0da52533..b22a990d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,7 @@ AC_HEADER_STDC
# POSIX
AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
- netinet/in_systm.h netinet/tcp.h pwd.h sched.h \
+ netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \
syslog.h sys/dl.h dlfcn.h])
AC_CHECK_HEADERS([netinet/ip.h], [], [],
@@ -203,9 +203,6 @@ AC_CHECK_HEADERS([sys/un.h], [HAVE_AF_UNIX=1], [HAVE_AF_UNIX=0])
AM_CONDITIONAL(HAVE_REGEX, test "x$HAVE_REGEX" = "x1")
AM_CONDITIONAL(HAVE_AF_UNIX, test "x$HAVE_AF_UNIX" = "x1")
-# XPG4-UNIX
-AC_CHECK_HEADERS([sys/poll.h])
-
# Linux
AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0])
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index bab8eb5c..ad4e4e97 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -34,8 +34,8 @@
#include <fcntl.h>
#include <errno.h>
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
#else
#include <pulsecore/poll.h>
#endif
diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 30685705..9dd47ae3 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -29,8 +29,8 @@
#include <signal.h>
#include <stdio.h>
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
#else
#include <pulsecore/poll.h>
#endif