commit 19cae23029239148852be728dd60a572da500293
author H. Peter Anvin <hpa@zytor.com> Sat Apr 22 09:53:14 2006 -0700
committer H. Peter Anvin <hpa@zytor.com> Sat Apr 22 09:53:14 2006 -0700
tree abca3cb099c3fc97bae97260e4251dc7e488e0e5
parent dc7ec367a05141c1f76ddf82a5a63422c0fc3a72
parent 8dcb78b186a4e9c76e3f91e99cbc0a56cd9a950c

Merge with git+ssh://master.kernel.org/pub/scm/libs/klibc/klibc.git

klibc/SYSCALLS.def

diff --git a/klibc/SYSCALLS.def b/klibc/SYSCALLS.def
index 89c0550..9d47fdb 100644
--- a/klibc/SYSCALLS.def
+++ b/klibc/SYSCALLS.def
@@ -21,7 +21,7 @@
 <?!ia64> pid_t clone::__clone(unsigned long, void *)
 <?ia64> pid_t clone::__clone2(unsigned long, void *, void *)
 # if ! _KLIBC_NO_MMU
-<!sparc> pid_t fork()
+<!sparc,ia64> pid_t fork()
 <sparc> pid_t fork@forkish()
 #endif
 #if _KLIBC_REAL_VFORK

klibc/ppoll.c

diff --git a/klibc/ppoll.c b/klibc/ppoll.c
index f314be6..5baa8d2 100644
--- a/klibc/ppoll.c
+++ b/klibc/ppoll.c
@@ -4,6 +4,8 @@
 
 #include <sys/poll.h>
 
+#ifndef __NR_ppoll
+
 __extern int __ppoll(struct pollfd *, nfds_t, struct timespec *,
 		     const sigset_t *, size_t);
 
@@ -12,3 +14,5 @@
 {
   return __ppoll(ufds, nfds, timeout, sigmask, sizeof *sigmask);
 }
+
+#endif