From: Roy Marples <roy@marples.name>
Date: Mon, 18 Feb 2013 21:35:24 +0000 (+0000)
Subject: Complete transition to pollts(2)
X-Git-Tag: v5.99.6~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d628ebf7db32a0ab1b5a47265436afad6b5969c6;p=thirdparty%2Fdhcpcd.git

Complete transition to pollts(2)
---

diff --git a/compat/ppoll.c b/compat/pollts.c
similarity index 91%
rename from compat/ppoll.c
rename to compat/pollts.c
index fa338ba1..65ea45b1 100644
--- a/compat/ppoll.c
+++ b/compat/pollts.c
@@ -35,11 +35,11 @@
 
 #include "ppoll.h"
 
-#warning "This ppoll(2) implementation is not entirely race condition safe."
-#warning "Only operating system support for ppoll(2) can correct this."
+#warning "This pollts(2) implementation is not entirely race condition safe."
+#warning "Only operating system support for pollts(2) can correct this."
 
 int
-ppoll(struct pollfd *restrict fds, nfds_t nfds,
+pollts(struct pollfd *restrict fds, nfds_t nfds,
     const struct timespec *restrict ts, const sigset_t *restrict sigmask)
 {
 	int r, timeout;
diff --git a/compat/ppoll.h b/compat/pollts.h
similarity index 95%
rename from compat/ppoll.h
rename to compat/pollts.h
index 45911a71..18a3cf1e 100644
--- a/compat/ppoll.h
+++ b/compat/pollts.h
@@ -33,7 +33,7 @@
 #include <time.h>
 
 int
-ppoll(struct pollfd *restrict, nfds_t, const struct timespec *restrict,
+pollts(struct pollfd *restrict, nfds_t, const struct timespec *restrict,
     const sigset_t *restrict);
 
 #endif
diff --git a/compat/pselect.c b/compat/pselect.c
index 5c5197ed..8c6d8ed1 100644
--- a/compat/pselect.c
+++ b/compat/pselect.c
@@ -33,10 +33,10 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "ppoll.h"
+#include "pollts.h"
 
 int
-ppoll(struct pollfd *restrict fds, nfds_t nfds,
+pollts(struct pollfd *restrict fds, nfds_t nfds,
     const struct timespec *restrict ts, const sigset_t *restrict sigmask)
 {
 	fd_set read_fds;
diff --git a/configure b/configure
index 9180c423..b868c44e 100755
--- a/configure
+++ b/configure
@@ -563,7 +563,6 @@ EOF
 		POLLTS=no
 		echo "no"
 	fi
-	echo "$POLLTS"
 	rm -f _ppoll.c _ppoll
 fi
 if [ "$POLLTS" = no ]; then
@@ -589,16 +588,16 @@ case "$POLLTS" in
 yes)
 	;;
 ppoll)
-	echo "#include \"compat/ppoll.h\"" >>$CONFIG_H
+	echo "#include \"compat/pollts.h\"" >>$CONFIG_H
 	echo "#define pollts ppoll" >>$CONFIG_H
 	;;
 pselect)
 	echo "COMPAT_SRCS+=	compat/pselect.c" >>$CONFIG_MK
-	echo "#include \"compat/ppoll.h\"" >>$CONFIG_H
+	echo "#include \"compat/pollts.h\"" >>$CONFIG_H
 	;;
 *)
-	echo "COMPAT_SRCS+=	compat/ppoll.c" >>$CONFIG_MK
-	echo "#include \"compat/ppoll.h\"" >>$CONFIG_H
+	echo "COMPAT_SRCS+=	compat/pollts.c" >>$CONFIG_MK
+	echo "#include \"compat/pollts.h\"" >>$CONFIG_H
 	;;
 esac