Initial 3-way merge from (5.001m, thr1m, 5.003) plus fixups.

p4raw-id: //depot/thrperl@4

1 files changed, 30 insertions, 26 deletions

diff --git a/proto.h b/proto.h
index 542d5663fd..4a86a34ff2 100644
--- a/proto.h
+++ b/proto.h
@@ -13,7 +13,7 @@ bool Gv_AMupdate _((HV* stash));
 OP*	append_elem _((I32 optype, OP* head, OP* tail));
 OP*	append_list _((I32 optype, LISTOP* first, LISTOP* last));
 I32	apply _((I32 type, SV** mark, SV** sp));
-void	assertref _((OP* op));
+void	assertref _((OP* o));
 void	av_clear _((AV* ar));
 void	av_extend _((AV* ar, I32 key));
 AV*	av_fake _((I32 size, SV** svp));
@@ -39,8 +39,8 @@ U32	cast_ulong _((double f));
 I32	chsize _((int fd, Off_t length));
 #endif
 OP *	ck_gvconst _((OP * o));
-OP *	ck_retarget _((OP *op));
-OP*	convert _((I32 optype, I32 flags, OP* op));
+OP *	ck_retarget _((OP *o));
+OP*	convert _((I32 optype, I32 flags, OP* o));
 char*	cpytill _((char* to, char* from, char* fromend, int delim, I32* retlen));
 void	croak _((char* pat,...)) __attribute__((format(printf,1,2),noreturn));
 CV*	cv_clone _((CV* proto));
@@ -54,7 +54,7 @@ I32	filter_read _((int idx, SV *buffer, int maxlen));
 I32	cxinc _((void));
 void	deb _((char* pat,...)) __attribute__((format(printf,1,2)));
 void	deb_growlevel _((void));
-I32	debop _((OP* op));
+I32	debop _((OP* o));
 I32	debstackptrs _((void));
 #ifdef DEBUGGING
 void	debprofdump _((void));
@@ -75,7 +75,7 @@ I32	do_ipcctl _((I32 optype, SV** mark, SV** sp));
 I32	do_ipcget _((I32 optype, SV** mark, SV** sp));
 #endif
 void	do_join _((SV* sv, SV* del, SV** mark, SV** sp));
-OP*	do_kv _((void));
+OP*	do_kv _((ARGSproto));
 #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
 I32	do_msgrcv _((SV** mark, SV** sp));
 I32	do_msgsnd _((SV** mark, SV** sp));
@@ -116,7 +116,7 @@ char*	fbm_instr _((unsigned char* big, unsigned char* bigend, SV* littlesv));
 OP*	force_list _((OP* arg));
 OP*	fold_constants _((OP * arg));
 void	free_tmps _((void));
-OP*	gen_constant_list _((OP* op));
+OP*	gen_constant_list _((OP* o));
 void	gp_free _((GV* gv));
 GP*	gp_ref _((GP* gp));
 GV*	gv_AVadd _((GV* gv));
@@ -149,6 +149,7 @@ SV**	hv_store _((HV* tb, char* key, U32 klen, SV* val, U32 hash));
 void	hv_undef _((HV* tb));
 I32	ibcmp _((U8* a, U8* b, I32 len));
 I32	ingroup _((I32 testgid, I32 effective));
+void	init_stacks _((ARGSproto));
 char*	instr _((char* big, char* little));
 bool	io_close _((IO* io));
 OP*	invert _((OP* cmd));
@@ -157,7 +158,7 @@ I32	keyword _((char* d, I32 len));
 void	leave_scope _((I32 base));
 void	lex_end _((void));
 void	lex_start _((SV *line));
-OP*	linklist _((OP* op));
+OP*	linklist _((OP* o));
 OP*	list _((OP* o));
 OP*	listkids _((OP* o));
 OP*	localize _((OP* arg, I32 lexical));
@@ -213,45 +214,48 @@ int	mg_get _((SV* sv));
 U32	mg_len _((SV* sv));
 void	mg_magical _((SV* sv));
 int	mg_set _((SV* sv));
-OP*	mod _((OP* op, I32 type));
+OP*	mod _((OP* o, I32 type));
 char*	moreswitches _((char* s));
+#ifdef USE_THREADS
+void	mutex_unlock _((void *m));
+#endif /* USE_THREADS */
 OP *	my _(( OP *));
 char*	my_bcopy _((char* from, char* to, I32 len));
 #if !defined(HAS_BZERO) && !defined(HAS_MEMSET)
 char*	my_bzero _((char* loc, I32 len));
 #endif
 void	my_exit _((U32 status)) __attribute__((noreturn));
-I32	my_lstat _((void));
+I32	my_lstat _((ARGSproto));
 #ifndef HAS_MEMCMP
 I32	my_memcmp _((unsigned char* s1, unsigned char* s2, I32 len));
 #endif
 I32	my_pclose _((FILE* ptr));
 FILE*	my_popen _((char* cmd, char* mode));
 void	my_setenv _((char* nam, char* val));
-I32	my_stat _((void));
+I32	my_stat _((ARGSproto));
 #ifdef MYSWAP
 short	my_swap _((short s));
 long	my_htonl _((long l));
 long	my_ntohl _((long l));
 #endif
 void	my_unexec _((void));
-OP*	newANONLIST _((OP* op));
-OP*	newANONHASH _((OP* op));
+OP*	newANONLIST _((OP* o));
+OP*	newANONHASH _((OP* o));
 OP*	newANONSUB _((I32 floor, OP* proto, OP* block));
 OP*	newASSIGNOP _((I32 flags, OP* left, I32 optype, OP* right));
 OP*	newCONDOP _((I32 flags, OP* expr, OP* trueop, OP* falseop));
-void	newFORM _((I32 floor, OP* op, OP* block));
+void	newFORM _((I32 floor, OP* o, OP* block));
 OP*	newFOROP _((I32 flags, char* label, line_t forline, OP* scalar, OP* expr, OP*block, OP*cont));
 OP*	newLOGOP _((I32 optype, I32 flags, OP* left, OP* right));
 OP*	newLOOPEX _((I32 type, OP* label));
 OP*	newLOOPOP _((I32 flags, I32 debuggable, OP* expr, OP* block));
 OP*	newNULLLIST _((void));
 OP*	newOP _((I32 optype, I32 flags));
-void	newPROG _((OP* op));
+void	newPROG _((OP* o));
 OP*	newRANGE _((I32 flags, OP* left, OP* right));
 OP*	newSLICEOP _((I32 flags, OP* subscript, OP* list));
 OP*	newSTATEOP _((I32 flags, char* label, OP* o));
-CV*	newSUB _((I32 floor, OP* op, OP* proto, OP* block));
+CV*	newSUB _((I32 floor, OP* o, OP* proto, OP* block));
 CV*	newXS _((char *name, void (*subaddr)(CV* cv), char *filename));
 #ifdef DEPRECATED
 CV*	newXSUB _((char *name, I32 ix, I32 (*subaddr)(int,int,int), char *filename));
@@ -288,7 +292,7 @@ FILE*	nextargv _((GV* gv));
 char*	ninstr _((char* big, char* bigend, char* little, char* lend));
 OP *	oopsCV _((OP* o));
 void	op_free _((OP* arg));
-void	package _((OP* op));
+void	package _((OP* o));
 PADOFFSET	pad_alloc _((I32 optype, U32 tmptype));
 PADOFFSET	pad_allocmy _((char* name));
 PADOFFSET	pad_findmy _((char* name));
@@ -299,7 +303,7 @@ SV*	pad_sv _((PADOFFSET po));
 void	pad_free _((PADOFFSET po));
 void	pad_reset _((void));
 void	pad_swipe _((PADOFFSET po));
-void	peep _((OP* op));
+void	peep _((OP* o));
 PerlInterpreter*	perl_alloc _((void));
 I32	perl_call_argv _((char* subname, I32 flags, char** argv));
 I32	perl_call_method _((char* methname, I32 flags));
@@ -321,21 +325,21 @@ int	perl_run _((PerlInterpreter* sv_interp));
 void	pidgone _((int pid, int status));
 void	pmflag _((U16* pmfl, int ch));
 OP*	pmruntime _((OP* pm, OP* expr, OP* repl));
-OP*	pmtrans _((OP* op, OP* expr, OP* repl));
+OP*	pmtrans _((OP* o, OP* expr, OP* repl));
 OP*	pop_return _((void));
 void	pop_scope _((void));
 OP*	prepend_elem _((I32 optype, OP* head, OP* tail));
-void	provide_ref _((OP* op, SV* sv));
-void	push_return _((OP* op));
+void	provide_ref _((OP* o, SV* sv));
+void	push_return _((OP* o));
 void	push_scope _((void));
 regexp*	pregcomp _((char* exp, char* xend, PMOP* pm));
-OP*	ref _((OP* op, I32 type));
-OP*	refkids _((OP* op, I32 type));
+OP*	ref _((OP* o, I32 type));
+OP*	refkids _((OP* o, I32 type));
 void	regdump _((regexp* r));
 I32	pregexec _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, I32 safebase));
 void	pregfree _((struct regexp* r));
 char*	regnext _((char* p));
-char*	regprop _((char* op));
+char*	regprop _((char* o));
 void	repeatcpy _((char* to, char* from, I32 len, I32 count));
 char*	rninstr _((char* big, char* bigend, char* little, char* lend));
 int	runops _((void));
@@ -367,7 +371,7 @@ void	save_delete _((HV* hv, char* key, I32 klen));
 void	save_destructor _((void (*f)(void*), void* p));
 #endif /* titan */
 void	save_freesv _((SV* sv));
-void	save_freeop _((OP* op));
+void	save_freeop _((OP* o));
 void	save_freepv _((char* pv));
 HV*	save_hash _((GV* gv));
 void	save_hptr _((HV** hptr));
@@ -383,9 +387,9 @@ void	save_sptr _((SV** sptr));
 SV*	save_svref _((SV** sptr));
 OP*	sawparens _((OP* o));
 OP*	scalar _((OP* o));
-OP*	scalarkids _((OP* op));
+OP*	scalarkids _((OP* o));
 OP*	scalarseq _((OP* o));
-OP*	scalarvoid _((OP* op));
+OP*	scalarvoid _((OP* o));
 unsigned long	scan_hex _((char* start, I32 len, I32* retlen));
 char*	scan_num _((char* s));
 unsigned long	scan_oct _((char* start, I32 len, I32* retlen));