Silence some VC6 compiler warnings in the regex code

p4raw-id: //depot/perl@31131

diff --git a/embed.fnc b/embed.fnc
index f850ef5..3257dd7 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -678,7 +678,7 @@ Ap  |I32    |pregexec       |NN REGEXP * const prog|NN char* stringarg \
                                |NN SV* screamer|U32 nosave
 Ap     |void   |pregfree       |NULLOK struct regexp* r
 EXp    |struct regexp* |reg_temp_copy  |NN struct regexp* r
-Ap     |void   |regfree_internal|NULLOK struct regexp* r
+Ap     |void   |regfree_internal|NULLOK REGEXP * const r
 Ap     |char * |reg_stringify  |NN MAGIC *mg|NULLOK STRLEN *lp|NULLOK U32 *flags|NULLOK I32 *haseval
 #if defined(USE_ITHREADS)
 Ap     |void*  |regdupe_internal|NN REGEXP * const r|NN CLONE_PARAMS* param

diff --git a/ext/re/re.xs b/ext/re/re.xs
index f3cf209..c569ad1 100644 (file)
--- a/ext/re/re.xs
+++ b/ext/re/re.xs
@@ -11,13 +11,13 @@
 
 START_EXTERN_C
 
-extern REGEXP* my_re_compile (pTHX_ const SV * const pattern, U32 pm_flags);
+extern REGEXP* my_re_compile (pTHX_ const SV * const pattern, const U32 pm_flags);
 extern I32     my_regexec (pTHX_ REGEXP * const prog, char* stringarg, char* strend,
                            char* strbeg, I32 minend, SV* screamer,
                            void* data, U32 flags);
 
 extern char*   my_re_intuit_start (pTHX_ REGEXP * const prog, SV *sv, char *strpos,
-                                   char *strend, U32 flags,
+                                   char *strend, const U32 flags,
                                    struct re_scream_pos_data_s *data);
 extern SV*     my_re_intuit_string (pTHX_ REGEXP * const prog);
 

diff --git a/proto.h b/proto.h
index 7154b7d..fbdf6c8 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1857,7 +1857,7 @@ PERL_CALLCONV void        Perl_pregfree(pTHX_ struct regexp* r);
 PERL_CALLCONV struct regexp*   Perl_reg_temp_copy(pTHX_ struct regexp* r)
                        __attribute__nonnull__(pTHX_1);
 
-PERL_CALLCONV void     Perl_regfree_internal(pTHX_ struct regexp* r);
+PERL_CALLCONV void     Perl_regfree_internal(pTHX_ REGEXP * const r);
 PERL_CALLCONV char *   Perl_reg_stringify(pTHX_ MAGIC *mg, STRLEN *lp, U32 *flags, I32 *haseval)
                        __attribute__nonnull__(pTHX_1);
 

diff --git a/regcomp.c b/regcomp.c
index 5750a02..baa5d99 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -8953,7 +8953,7 @@ Perl_reg_temp_copy (pTHX_ struct regexp *r) {
  */
  
 void
-Perl_regfree_internal(pTHX_ struct regexp *r)
+Perl_regfree_internal(pTHX_ REGEXP * const r)
 {
     dVAR;
     RXi_GET_DECL(r,ri);