Retract #11289.

p4raw-id: //depot/perl@11293

5 files changed, 3 insertions, 18 deletions

diff --git a/embed.h b/embed.h
index ded9dc1ab3..cb9eb6c0fd 100644
--- a/embed.h
+++ b/embed.h
@@ -73,8 +73,6 @@
 #define append_list		Perl_append_list
 #define apply			Perl_apply
 #define apply_attrs_string	Perl_apply_attrs_string
-#define atfork_lock		Perl_atfork_lock
-#define atfork_unlock		Perl_atfork_unlock
 #define avhv_delete_ent		Perl_avhv_delete_ent
 #define avhv_exists_ent		Perl_avhv_exists_ent
 #define avhv_fetch_ent		Perl_avhv_fetch_ent
@@ -1606,8 +1604,6 @@
 #define append_list(a,b,c)	Perl_append_list(aTHX_ a,b,c)
 #define apply(a,b,c)		Perl_apply(aTHX_ a,b,c)
 #define apply_attrs_string(a,b,c,d)	Perl_apply_attrs_string(aTHX_ a,b,c,d)
-#define atfork_lock(a)		Perl_atfork_lock(aTHX_ a)
-#define atfork_unlock(a)	Perl_atfork_unlock(aTHX_ a)
 #define avhv_delete_ent(a,b,c,d)	Perl_avhv_delete_ent(aTHX_ a,b,c,d)
 #define avhv_exists_ent(a,b,c)	Perl_avhv_exists_ent(aTHX_ a,b,c)
 #define avhv_fetch_ent(a,b,c,d)	Perl_avhv_fetch_ent(aTHX_ a,b,c,d)
@@ -3120,10 +3116,6 @@
 #define apply			Perl_apply
 #define Perl_apply_attrs_string	CPerlObj::Perl_apply_attrs_string
 #define apply_attrs_string	Perl_apply_attrs_string
-#define Perl_atfork_lock	CPerlObj::Perl_atfork_lock
-#define atfork_lock		Perl_atfork_lock
-#define Perl_atfork_unlock	CPerlObj::Perl_atfork_unlock
-#define atfork_unlock		Perl_atfork_unlock
 #define Perl_avhv_delete_ent	CPerlObj::Perl_avhv_delete_ent
 #define avhv_delete_ent		Perl_avhv_delete_ent
 #define Perl_avhv_exists_ent	CPerlObj::Perl_avhv_exists_ent
diff --git a/embed.pl b/embed.pl
index 0b61bf00c5..82ebfd2d8f 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1399,8 +1399,6 @@ p	|OP*	|append_elem	|I32 optype|OP* head|OP* tail
 p	|OP*	|append_list	|I32 optype|LISTOP* first|LISTOP* last
 p	|I32	|apply		|I32 type|SV** mark|SV** sp
 Ap	|void	|apply_attrs_string|char *stashpv|CV *cv|char *attrstr|STRLEN len
-p	|void	|atfork_lock
-p	|void	|atfork_unlock
 Ap	|SV*	|avhv_delete_ent|AV *ar|SV* keysv|I32 flags|U32 hash
 Ap	|bool	|avhv_exists_ent|AV *ar|SV* keysv|U32 hash
 Ap	|SV**	|avhv_fetch_ent	|AV *ar|SV* keysv|I32 lval|U32 hash
diff --git a/perl.c b/perl.c
index 91caf60884..25cdcd6e4b 100644
--- a/perl.c
+++ b/perl.c
@@ -61,7 +61,7 @@ static I32 read_e_script(pTHXo_ int idx, SV *buf_sv, int maxlen);
 
 /* this is called in parent before the fork() */
 void
-Perl_atfork_lock(pTHX)
+Perl_atfork_lock(void)
 {
     /* locks must be held in locking order (if any) */
 #ifdef MYMALLOC
@@ -72,7 +72,7 @@ Perl_atfork_lock(pTHX)
 
 /* this is called in both parent and child after the fork() */
 void
-Perl_atfork_unlock(pTHX)
+Perl_atfork_unlock(void)
 {
     /* locks must be released in same order as in S_atfork_lock() */
 #ifdef MYMALLOC
diff --git a/proto.h b/proto.h
index f36207144d..5110345ccf 100644
--- a/proto.h
+++ b/proto.h
@@ -63,8 +63,6 @@ PERL_CALLCONV OP*	Perl_append_elem(pTHX_ I32 optype, OP* head, OP* tail);
 PERL_CALLCONV OP*	Perl_append_list(pTHX_ I32 optype, LISTOP* first, LISTOP* last);
 PERL_CALLCONV I32	Perl_apply(pTHX_ I32 type, SV** mark, SV** sp);
 PERL_CALLCONV void	Perl_apply_attrs_string(pTHX_ char *stashpv, CV *cv, char *attrstr, STRLEN len);
-PERL_CALLCONV void	Perl_atfork_lock(pTHX_ void);
-PERL_CALLCONV void	Perl_atfork_unlock(pTHX_ void);
 PERL_CALLCONV SV*	Perl_avhv_delete_ent(pTHX_ AV *ar, SV* keysv, I32 flags, U32 hash);
 PERL_CALLCONV bool	Perl_avhv_exists_ent(pTHX_ AV *ar, SV* keysv, U32 hash);
 PERL_CALLCONV SV**	Perl_avhv_fetch_ent(pTHX_ AV *ar, SV* keysv, I32 lval, U32 hash);
diff --git a/thread.h b/thread.h
index f36e7a2ad7..a1e8fdc65b 100644
--- a/thread.h
+++ b/thread.h
@@ -303,11 +303,8 @@
 #endif
 
 #ifndef PTHREAD_ATFORK
-typedef void(*Perl_pthread_atfork_t)(void);
 #  define PTHREAD_ATFORK(prepare,parent,child)			\
-    pthread_atfork((Perl_pthread_atfork_t)prepare,\
-	           (Perl_pthread_atfork_t)parent,\
-                   (Perl_pthread_atfork_t)child)
+    pthread_atfork(prepare,parent,child)
 #endif
 
 #ifndef THREAD_RET_TYPE