Merge maint-5.004 branch (5.004_04) with mainline.

p4raw-id: //depot/perl@137

1 files changed, 4 insertions, 1 deletions

diff --git a/proto.h b/proto.h
index 84160a635f..7123beebca 100644
--- a/proto.h
+++ b/proto.h
@@ -34,6 +34,7 @@ I32	av_len _((AV* ar));
 AV*	av_make _((I32 size, SV** svp));
 SV*	av_pop _((AV* ar));
 void	av_push _((AV* ar, SV* val));
+void	av_reify _((AV* ar));
 SV*	av_shift _((AV* ar));
 SV**	av_store _((AV* ar, I32 key, SV* val));
 void	av_undef _((AV* ar));
@@ -241,6 +242,7 @@ int	magic_setsubstr	_((SV* sv, MAGIC* mg));
 int	magic_settaint	_((SV* sv, MAGIC* mg));
 int	magic_setuvar	_((SV* sv, MAGIC* mg));
 int	magic_setvec	_((SV* sv, MAGIC* mg));
+int	magic_set_all_env _((SV* sv, MAGIC* mg));
 int	magic_wipepack	_((SV* sv, MAGIC* mg));
 void	magicname _((char* sym, char* name, I32 namlen));
 int	main _((int argc, char** argv, char** env));
@@ -334,7 +336,8 @@ SV*	newSVpvf _((const char* pat, ...));
 SV*	newSVrv _((SV* rv, char* classname));
 SV*	newSVsv _((SV* old));
 OP*	newUNOP _((I32 type, I32 flags, OP* first));
-OP*	newWHILEOP _((I32 flags, I32 debuggable, LOOP* loop, OP* expr, OP* block, OP* cont));
+OP*	newWHILEOP _((I32 flags, I32 debuggable, LOOP* loop,
+		      I32 whileline, OP* expr, OP* block, OP* cont));
 PerlIO*	nextargv _((GV* gv));
 char*	ninstr _((char* big, char* bigend, char* little, char* lend));
 OP*	oopsCV _((OP* o));