svn commit: trunk/uClibc/libpthread/linuxthreads

[psm at uclibc.org]

Author: psm
Date: 2006-03-09 07:43:42 -0800 (Thu, 09 Mar 2006)
New Revision: 14487

Log:
Sync w/ upstream, hide pthread_atfork

Modified:
   trunk/uClibc/libpthread/linuxthreads/pthread_atfork.c


Changeset:
Modified: trunk/uClibc/libpthread/linuxthreads/pthread_atfork.c
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/pthread_atfork.c	2006-03-09 15:18:36 UTC (rev 14486)
+++ trunk/uClibc/libpthread/linuxthreads/pthread_atfork.c	2006-03-09 15:43:42 UTC (rev 14487)
@@ -44,8 +44,10 @@
 /* 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 @@
   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