applied patch, slightly tweaked

[p5sagit/p5-mst-13.2.git] / proto.h

diff --git a/proto.h b/proto.h
index 34d84cf..e1b91dc 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -430,12 +430,10 @@ VIRTUAL void      pop_scope _((void));
 VIRTUAL OP*    prepend_elem _((I32 optype, OP* head, OP* tail));
 VIRTUAL void   push_return _((OP* o));
 VIRTUAL void   push_scope _((void));
-VIRTUAL regexp*        pregcomp _((char* exp, char* xend, PMOP* pm));
 VIRTUAL OP*    ref _((OP* o, I32 type));
 VIRTUAL OP*    refkids _((OP* o, I32 type));
 VIRTUAL void   regdump _((regexp* r));
 VIRTUAL I32    pregexec _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, U32 nosave));
-VIRTUAL I32    regexec_flags _((regexp* prog, char* stringarg, char* strend, char* strbeg, I32 minend, SV* screamer, void* data, U32 flags));
 VIRTUAL void   pregfree _((struct regexp* r));
 VIRTUAL regnode* regnext _((regnode* p));
 VIRTUAL void   regprop _((SV* sv, regnode* o));
@@ -703,6 +701,7 @@ I32 dopoptoeval _((I32 startingblock));
 I32 dopoptolabel _((char *label));
 I32 dopoptoloop _((I32 startingblock));
 I32 dopoptosub _((I32 startingblock));
+I32 dopoptosub_at _((PERL_CONTEXT* cxstk, I32 startingblock));
 void save_lines _((AV *array, SV *sv));
 OP *doeval _((int gimme, OP** startop));
 SV *mul128 _((SV *sv, U8 m));
@@ -711,6 +710,12 @@ int div128 _((SV *pnum, bool *done));
 
 int runops_standard _((void));
 int runops_debug _((void));
+
+regexp*        pregcomp _((char* exp, char* xend, PMOP* pm));
+I32    regexec_flags _((regexp* prog, char* stringarg, char* strend,
+                        char* strbeg, I32 minend, SV* screamer,
+                        void* data, U32 flags));
+
 void check_uni _((void));
 void  force_next _((I32 type));
 char *force_version _((char *start));
@@ -721,7 +726,7 @@ char *scan_formline _((char *s));
 char *scan_heredoc _((char *s));
 char *scan_ident _((char *s, char *send, char *dest, STRLEN destlen, I32 ck_uni));
 char *scan_inputsymbol _((char *start));
-char *scan_pat _((char *start));
+char *scan_pat _((char *start, I32 type));
 char *scan_str _((char *start));
 char *scan_subst _((char *start));
 char *scan_trans _((char *start));
@@ -875,6 +880,10 @@ VIRTUAL SV**       get_specialsv_list _((void));
 VIRTUAL int&   ErrorNo _((void));
 #endif /* WIN32 */
 #else  /* !PERL_OBJECT */
+regexp*        pregcomp _((char* exp, char* xend, PMOP* pm));
+I32            regexec_flags _((regexp* prog, char* stringarg, char* strend,
+                        char* strbeg, I32 minend, SV* screamer,
+                        void* data, U32 flags));
 END_EXTERN_C
 #endif /* PERL_OBJECT */