summaryrefslogtreecommitdiff
path: root/libpthread/nptl
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-14 19:58:35 +0100
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:24 +0200
commitb91a7f431d894b7bafc5f8456f0c4f35e682caf6 (patch)
treee67e71a39d1b880dfba84549d481d764e62b4fa2 /libpthread/nptl
parent741caa9982ba54bd58867b59ce2acf07de779bab (diff)
cleanup fork()
Keep only fork (and it's hidden variant) and __libc_fork. Common __libc_fork prototype in unistd.h. Get rid of __fork, by changing HIDDEN_JUMPTARGET(__fork) to use fork I can't see the reason to have fork() in libpthread, but kept it for now making __fork static in these files. Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread/nptl')
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/fork.c3
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c4
2 files changed, 1 insertions, 6 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c
index 6ad9053b7..ab4a6e6eb 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/fork.c
@@ -58,7 +58,6 @@ fresetlockfiles (void)
#endif
}
-extern __typeof(fork) __libc_fork;
pid_t
__libc_fork (void)
{
@@ -223,7 +222,5 @@ __libc_fork (void)
return pid;
}
-weak_alias(__libc_fork,__fork)
-libc_hidden_proto(fork)
weak_alias(__libc_fork,fork)
libc_hidden_weak(fork)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c
index 3e1b70f86..b8a938c43 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pt-fork.c
@@ -19,9 +19,7 @@
#include <unistd.h>
-extern int __libc_fork (void);
-
-pid_t
+static pid_t
__fork (void)
{
return __libc_fork ();