summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-03-09 15:43:42 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-03-09 15:43:42 +0000
commitdb33a4464437e23761ad91168e5f07bad74ac452 (patch)
treeb138ec71c88301458b48b5846c3e4db061c036f0
parent41db918cae7e12e2d0c3873693b99622de52a4af (diff)
Sync w/ upstream, hide pthread_atfork
-rw-r--r--libpthread/linuxthreads/pthread_atfork.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libpthread/linuxthreads/pthread_atfork.c b/libpthread/linuxthreads/pthread_atfork.c
index 2a67e3d6e..2464acb6b 100644
--- a/libpthread/linuxthreads/pthread_atfork.c
+++ b/libpthread/linuxthreads/pthread_atfork.c
@@ -44,8 +44,10 @@ extern void *__dso_handle __attribute__ ((__weak__));
/* Hide the symbol so that no definition but the one locally in the
executable or DSO is used. */
int
+#ifndef __pthread_atfork
/* Don't mark the compatibility function as hidden. */
attribute_hidden
+#endif
__pthread_atfork (prepare, parent, child)
void (*prepare) (void);
void (*parent) (void);
@@ -54,4 +56,8 @@ __pthread_atfork (prepare, parent, child)
return __register_atfork (prepare, parent, child,
&__dso_handle == NULL ? NULL : __dso_handle);
}
+#ifndef __pthread_atfork
+extern int pthread_atfork (void (*prepare) (void), void (*parent) (void),
+ void (*child) (void)) attribute_hidden;
strong_alias (__pthread_atfork, pthread_atfork)
+#endif