Revert "common: Prefer __register_atfork() to pthread_atfork() if possible"

This reverts commit ce3cec7f8742254b8627b9db48973b81e91cbfc8.

diff --git a/common/library.c b/common/library.c
index b72465ba587a10c7969fc702d66f803df9d44610..c1275f3229b9d0b261d12e148ce7cdf6a8458d92 100644 (file)
--- a/common/library.c
+++ b/common/library.c
@@ -138,23 +138,6 @@ _p11_library_get_thread_local (void)
 }
 #endif
 
-#if defined(HAVE_DECL___REGISTER_ATFORK) && !HAVE_DECL___REGISTER_ATFORK
-extern int __register_atfork (void (*prepare) (void), void (*parent) (void),
-                             void (*child) (void), void *dso_handle);
-#endif /* HAVE_DECL___REGISTER_ATFORK */
-
-#ifdef HAVE___REGISTER_ATFORK
-
-#define p11_register_atfork(a,b,c,d) \
-       (__register_atfork((a),(b),(c),(d)))
-
-#else
-
-#define p11_register_atfork(a,b,c,d) \
-       (pthread_atfork((a),(b),(c)))
-
-#endif /* HAVE___REGISTER_ATFORK */
-
 static void
 count_forks (void)
 {
@@ -177,7 +160,7 @@ p11_library_init_impl (void)
        p11_message_locale = newlocale (LC_ALL_MASK, "POSIX", (locale_t) 0);
 #endif
 
-       p11_register_atfork (NULL, NULL, count_forks, NULL);
+       pthread_atfork (NULL, NULL, count_forks);
 }
 
 void

diff --git a/configure.ac b/configure.ac
index 93a6c83f6e64d0894582c1c2f80ce981b0d3194b..28dd32dd621699c9eece0dead23c1991e96cb675 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,6 @@ if test "$os_unix" = "yes"; then
        AC_CHECK_FUNCS([setenv])
        AC_CHECK_FUNCS([getpeereid])
        AC_CHECK_FUNCS([getpeerucred])
-       AC_CHECK_FUNCS([__register_atfork])
-       AC_CHECK_DECLS([__register_atfork])
 
        # Check if issetugid() is available and has compatible behavior with OpenBSD
        AC_CHECK_FUNCS([issetugid], [