[win32] integrate mainline changes

p4raw-id: //depot/asperl@799

1 files changed, 3 insertions, 1 deletions

diff --git a/proto.h b/proto.h
index 9678437cc9..0960ce5fd1 100644
--- a/proto.h
+++ b/proto.h
@@ -152,7 +152,7 @@ void	dump_op _((OP* arg));
 void	dump_pm _((PMOP* pm));
 void	dump_packsubs _((HV* stash));
 void	dump_sub _((GV* gv));
-VIRTUAL void	fbm_compile _((SV* sv));
+VIRTUAL void	fbm_compile _((SV* sv, U32 flags));
 VIRTUAL char*	fbm_instr _((unsigned char* big, unsigned char* bigend, SV* littlesv));
 #ifdef USE_THREADS
 VIRTUAL PADOFFSET	find_threadsv _((char *name));
@@ -465,6 +465,7 @@ VIRTUAL I32	same_dirent _((char* a, char* b));
 VIRTUAL char*	savepv _((char* sv));
 VIRTUAL char*	savepvn _((char* sv, I32 len));
 VIRTUAL void	savestack_grow _((void));
+VIRTUAL void	save_aelem _((AV* av, I32 idx, SV **sptr));
 VIRTUAL void	save_aptr _((AV** aptr));
 VIRTUAL AV*	save_ary _((GV* gv));
 VIRTUAL void	save_clearsv _((SV** svp));
@@ -482,6 +483,7 @@ VIRTUAL void	save_freeop _((OP* o));
 VIRTUAL void	save_freepv _((char* pv));
 VIRTUAL void	save_gp _((GV* gv, I32 empty));
 VIRTUAL HV*	save_hash _((GV* gv));
+VIRTUAL void	save_helem _((HV* hv, SV *key, SV **sptr));
 VIRTUAL void	save_hptr _((HV** hptr));
 VIRTUAL void	save_I16 _((I16* intp));
 VIRTUAL void	save_I32 _((I32* intp));