applied patch, with tweak suggested by Michael Parker

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

diff --git a/proto.h b/proto.h
index 8599e02..8b42914 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -74,7 +74,7 @@ VIRTUAL char **       get_op_names _((void));
 VIRTUAL char * get_no_modify _((void));
 VIRTUAL U32 *  get_opargs _((void));
 VIRTUAL I32    cxinc _((void));
-VIRTUAL void   deb _((const char* pat,...)) __attribute__((format(printf,1,2)));
+VIRTUAL void   deb _((const char* pat,...)) /*__attribute__((format(printf,1,2)))*/;
 VIRTUAL void   deb_growlevel _((void));
 VIRTUAL void   debprofdump _((void));
 VIRTUAL I32    debop _((OP* o));
@@ -209,7 +209,6 @@ VIRTUAL int magic_clear_all_env _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_clearpack _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_clearsig  _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_existspack _((SV* sv, MAGIC* mg));
-VIRTUAL int    magic_freedefelem _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_freeregexp _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_get       _((SV* sv, MAGIC* mg));
 VIRTUAL int    magic_getarylen _((SV* sv, MAGIC* mg));
@@ -435,6 +434,10 @@ 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 void   pregfree _((struct regexp* r));
+VIRTUAL regexp*        pregcomp _((char* exp, char* xend, PMOP* pm));
+VIRTUAL I32    regexec_flags _((regexp* prog, char* stringarg, char* strend,
+                        char* strbeg, I32 minend, SV* screamer,
+                        void* data, U32 flags));
 VIRTUAL regnode* regnext _((regnode* p));
 VIRTUAL void   regprop _((SV* sv, regnode* o));
 VIRTUAL void   repeatcpy _((char* to, char* from, I32 len, I32 count));
@@ -701,6 +704,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));
@@ -710,11 +714,6 @@ 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));
@@ -725,7 +724,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));