From 06419c7f9c4600bfcdda7ac631870d5442908d0f Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sat, 16 Apr 2011 01:44:12 +0200
Subject: ppoll: no need for hidden version

Guard as GNU extension.
Reorganize a bit.

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 include/sys/poll.h                |  1 -
 libc/sysdeps/linux/common/ppoll.c | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/sys/poll.h b/include/sys/poll.h
index 53ba6e2eb..1f5e12c61 100644
--- a/include/sys/poll.h
+++ b/include/sys/poll.h
@@ -68,7 +68,6 @@ libc_hidden_proto(poll)
 extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
 		  __const struct timespec *__timeout,
 		  __const __sigset_t *__ss);
-libc_hidden_proto(ppoll)
 #endif
 
 __END_DECLS
diff --git a/libc/sysdeps/linux/common/ppoll.c b/libc/sysdeps/linux/common/ppoll.c
index 09b2b1539..3ca3f7333 100644
--- a/libc/sysdeps/linux/common/ppoll.c
+++ b/libc/sysdeps/linux/common/ppoll.c
@@ -17,13 +17,13 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <signal.h>
 #include <sys/syscall.h>
-#include <sys/poll.h>
-#define __need_NULL
-#include <stddef.h>
 
-#if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__
+#if defined __NR_ppoll && defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
+# define __need_NULL
+# include <stddef.h>
+# include <signal.h>
+# include <sys/poll.h>
 # ifdef __UCLIBC_HAS_THREADS_NATIVE__
 #  include <sysdep-cancel.h>
 # else
@@ -51,5 +51,4 @@ ppoll(struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
 	return result;
 # endif
 }
-libc_hidden_def(ppoll)
 #endif
-- 
cgit v1.2.3