[git commit future] make NPTL's getpid behave similar to the common one

Peter S. Mazinger ps.m at gmx.net
Wed Apr 20 10:50:38 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=d11c6ee589e7cf4787c23b59a417db47ffda2866
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

make __getpid static
provide getppid alias if needed
remove unneeded libc_hidden_proto

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c b/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
index d4de3cd..d2b3384 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/getpid.c
@@ -21,6 +21,10 @@
 #include <tls.h>
 #include <sysdep.h>
 
+#ifdef __NR_getxpid
+# undef __NR_getpid
+# define __NR_getpid __NR_getxpid
+#endif
 
 #ifndef NOT_IN_libc
 static inline __attribute__((always_inline)) pid_t really_getpid (pid_t oldval);
@@ -46,8 +50,7 @@ really_getpid (pid_t oldval)
 }
 #endif
 
-extern __typeof(getpid) __getpid;
-pid_t
+static pid_t
 __getpid (void)
 {
 #ifdef NOT_IN_libc
@@ -60,6 +63,8 @@ __getpid (void)
 #endif
   return result;
 }
-libc_hidden_proto(getpid)
 weak_alias(__getpid, getpid)
 libc_hidden_weak(getpid)
+#if !defined NOT_IN_libc && !defined __NR_getppid
+strong_alias(getpid,getppid)
+#endif
-- 
1.7.3.4



More information about the uClibc-cvs mailing list